{"push_id":617443806,"size":1,"distinct_size":1,"ref":"refs/heads/Celestra-Tracking-System-Orig","head":"d4a9909ccdc3ce1a47719800d4ec05a8138e9cf8","before":"f7e87beb4a8910ac7693501abafe57be0f6d4ab4","commits":[{"sha":"d4a9909ccdc3ce1a47719800d4ec05a8138e9cf8","author":{"email":"2a6155d62b333ed4818a6627e19ffeb6dcb67793@gmail.com","name":"Miko Garcia"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tCelestra-Tracking System/bin/controller/AccountController.class\n\tCelestra-Tracking System/bin/controller/Controller.class\n\tCelestra-Tracking System/bin/controller/InventoryController.class\n\tCelestra-Tracking System/bin/controller/OrderItemController.class\n\tCelestra-Tracking System/bin/db/DatabaseConnection.class\n\tCelestra-Tracking System/bin/exception/ConfirmPasswordException.class\n\tCelestra-Tracking\nSystem/bin/exception/InvalidOldPasswordException.class\n\tCelestra-Tracking\nSystem/bin/exception/ModelItemMandatoryException.class\n\tCelestra-Tracking System/bin/exception/NoRecordFoundException.class\n\tCelestra-Tracking System/bin/exception/PasswordException.class\n\tCelestra-Tracking\nSystem/bin/exception/SameOldNewPasswordException.class\n\tCelestra-Tracking System/bin/exception/ShortPasswordException.class\n\tCelestra-Tracking System/bin/exception/SpacePasswordException.class\n\tCelestra-Tracking System/bin/model/AccountModel.class\n\tCelestra-Tracking System/bin/model/DataType.class\n\tCelestra-Tracking System/bin/model/InventoryModel.class\n\tCelestra-Tracking System/bin/model/Model.class\n\tCelestra-Tracking System/bin/model/ModelItem.class\n\tCelestra-Tracking System/bin/model/OrderItemModel.class\n\tCelestra-Tracking System/bin/pojo/Account.class\n\tCelestra-Tracking System/bin/pojo/Alteration$AlterationBuilder.class\n\tCelestra-Tracking System/bin/pojo/Alteration.class\n\tCelestra-Tracking\nSystem/bin/pojo/BottomMeasurement$BottomMeasurementBuilder.class\n\tCelestra-Tracking System/bin/pojo/BottomMeasurement.class\n\tCelestra-Tracking System/bin/pojo/Client$ClientBuilder.class\n\tCelestra-Tracking System/bin/pojo/Client.class\n\tCelestra-Tracking System/bin/pojo/Embroidery$EmbroideryBuilder.class\n\tCelestra-Tracking System/bin/pojo/Embroidery.class\n\tCelestra-Tracking System/bin/pojo/EmbroideryType.class\n\tCelestra-Tracking System/bin/pojo/Garment.class\n\tCelestra-Tracking\nSystem/bin/pojo/GarmentOrder$GarmentOrderBuilder.class\n\tCelestra-Tracking System/bin/pojo/GarmentOrder.class\n\tCelestra-Tracking System/bin/pojo/GarmentType.class\n\tCelestra-Tracking System/bin/pojo/Gender.class\n\tCelestra-Tracking System/bin/pojo/Inventory.class\n\tCelestra-Tracking System/bin/pojo/Material.class\n\tCelestra-Tracking System/bin/pojo/Measurement$MeasurementBuilder.class\n\tCelestra-Tracking System/bin/pojo/Measurement.class\n\tCelestra-Tracking System/bin/pojo/OrderItem$OrderBuilder.class\n\tCelestra-Tracking System/bin/pojo/OrderItem.class\n\tCelestra-Tracking System/bin/pojo/OrderList$OrderListBuilder.class\n\tCelestra-Tracking System/bin/pojo/OrderList.class\n\tCelestra-Tracking System/bin/pojo/OrderStatus.class\n\tCelestra-Tracking\nSystem/bin/pojo/TopMeasurement$TopMeasurementBuilder.class\n\tCelestra-Tracking System/bin/pojo/TopMeasurement.class\n\tCelestra-Tracking\nSystem/bin/pojo/WomensTopMeasure$WomensTopMeasureBuilder.class\n\tCelestra-Tracking System/bin/pojo/WomensTopMeasure.class\n\tCelestra-Tracking System/bin/view/AddItemPanel.class\n\tCelestra-Tracking System/bin/view/AddOrderPanel.class\n\tCelestra-Tracking System/bin/view/AlterationPanel.class\n\tCelestra-Tracking System/bin/view/BottomPanel.class\n\tCelestra-Tracking System/bin/view/ChangePasswordView.class\n\tCelestra-Tracking System/bin/view/Driver.class\n\tCelestra-Tracking System/bin/view/EmbroideryPanel.class\n\tCelestra-Tracking System/bin/view/FullBodyPanel.class\n\tCelestra-Tracking System/bin/view/GarmentTypePanel.class\n\tCelestra-Tracking System/bin/view/InventoryDetailsPanel.class\n\tCelestra-Tracking System/bin/view/InventoryListPanel$1.class\n\tCelestra-Tracking System/bin/view/InventoryListPanel.class\n\tCelestra-Tracking System/bin/view/MainFrame.class\n\tCelestra-Tracking System/bin/view/OrderDetailsPanel.class\n\tCelestra-Tracking System/bin/view/OrderListPanel$1.class\n\tCelestra-Tracking System/bin/view/OrderListPanel.class\n\tCelestra-Tracking System/bin/view/TopPanel.class\n\tCelestra-Tracking System/bin/view/UneditableJTable.class\n\tCelestra-Tracking System/src/db/DatabaseConnection.java\n\tCelestra-Tracking System/src/pojo/Alteration.java\n\tCelestra-Tracking System/src/pojo/Client.java\n\tCelestra-Tracking System/src/pojo/Embroidery.java\n\tCelestra-Tracking System/src/pojo/EmbroideryType.java\n\tCelestra-Tracking System/src/pojo/Garment.java\n\tCelestra-Tracking System/src/pojo/GarmentOrder.java\n\tCelestra-Tracking System/src/pojo/Gender.java\n\tCelestra-Tracking System/src/pojo/Material.java\n\tCelestra-Tracking System/src/pojo/Measurement.java\n\tCelestra-Tracking System/src/pojo/OrderItem.java\n\tCelestra-Tracking System/src/pojo/OrderList.java\n\tCelestra-Tracking System/src/pojo/OrderStatus.java\n\tCelestra-Tracking System/src/pojo/TopMeasurement.java\n\tCelestra-Tracking System/src/pojo/WomensTopMeasure.java","distinct":true,"url":"https://api.github.com/repos/RedJaguars/Source-Code/commits/d4a9909ccdc3ce1a47719800d4ec05a8138e9cf8"}]}