# Conflicts:
#	.idea/vcs.xml
#	SchedulerApp/src/main/java/com/example/schedulerapp/RafisWeirdClass.java
#	SchedulerApp/src/main/java/com/example/schedulerapp/ReceiveThread.java
#	SchedulerApp/src/main/java/com/example/schedulerapp/Schedule.java
#	SchedulerApp/target/classes/com/example/schedulerapp/Controller.class
#	SchedulerApp/target/classes/com/example/schedulerapp/Model.class
#	SchedulerApp/target/classes/com/example/schedulerapp/ModelSubscriber.class
#	SchedulerApp/target/classes/com/example/schedulerapp/Schedule.class
#	SchedulerApp/target/classes/com/example/schedulerapp/ScheduleApp.class
#	SchedulerApp/target/classes/com/example/schedulerapp/ScheduleView.class
#	SchedulerApp/target/classes/com/example/schedulerapp/Staff.class
#	SchedulerApp/target/classes/com/example/schedulerapp/addEmployee.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/addShiftPopup.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/editEmployee.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/headerManager.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/login.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/paystubView.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/removeEmployee.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/schedBottomPanelManager.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/schedSidePanel.fxml
#	SchedulerApp/target/classes/com/example/schedulerapp/staffManagerSidePanel.fxml