# Conflicts:
#	src/main/resources/public/css/style.css
#	src/main/resources/public/index.html
#	src/main/resources/public/pages/employee/createEmployee.html
#	src/main/resources/public/pages/issue/IssueController.js
#	src/main/resources/public/pages/issue/IssueDetailViews.html
#	src/main/resources/public/pages/issue/IssueView.html
#	src/main/resources/public/pages/issue/IssuesDetailController.js
#	src/main/resources/public/pages/leaveform/leaveForm.html
#	src/main/resources/public/pages/leaveform/leaveFormController.js
#	src/main/resources/public/pages/project/groupproject/groupProjectAddView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectEditView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectViewController.js
#	src/main/resources/public/pages/project/project/projectEditViews.html
#	src/main/resources/public/pages/project/project/projectListViews.html
#	src/main/resources/public/pages/project/project/projectViewController.js
#	src/main/resources/public/pages/timesheet/timeSheetController.js
#	src/main/resources/public/pages/timesheet/timesheet.html

# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/access/homepage/business/CatalogiBusiness.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/business/NewsBusiness.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/CatalogiController.java
#	src/main/java/com/itsol/quantrivanphong/access/homepage/controller/NewsController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/bussiness/ProjectBussinessImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/project/controller/ProjectController.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/bussiness/ProjectGroupBussinessImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/common/EmployeeRepositoryImpl.java
#	src/main/java/com/itsol/quantrivanphong/manager/project/projectgroup/controller/ProjectGroupController.java
#	src/main/java/com/itsol/quantrivanphong/model/Catalogi.java
#	src/main/java/com/itsol/quantrivanphong/model/Eproject.java
#	src/main/java/com/itsol/quantrivanphong/model/News.java
#	src/main/java/com/itsol/quantrivanphong/report/issue/common/AbstractEntityManagerDao.java
#	src/main/java/com/itsol/quantrivanphong/report/issue/common/GennericeEntityManagerDao.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/business/LeaveFormBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/leaveform/controller/LeaveFormController.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java
#	src/main/resources/public/layout/layout1.html
#	src/main/resources/public/pages/report/employeeListViews.html
#	src/main/resources/public/pages/report/employeeListViews1.html
#	src/main/resources/public/pages/report/reportController.js
#	src/main/resources/public/pages/report/reportPage.html

# Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js
#	src/main/resources/public/layout/layout3.html

# Conflicts:
#	pom.xml
#	src/main/resources/public/pages/homepage/catagoriManagements.html
#	src/main/resources/public/pages/homepage/homeController.js
#	src/main/resources/public/pages/homepage/homepage.html
#	src/main/resources/public/pages/homepage/newsManagements.html
#	src/main/resources/public/pages/leaveform/leaveForm.html
#	src/main/resources/public/pages/leaveform/leaveFormController.js
#	src/main/resources/public/pages/leaveform/leaveFormDetail.html
#	src/main/resources/public/pages/leaveform/leaveFormDetailController.js
#	src/main/resources/public/pages/project/groupproject/groupProjectAddView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectController.js
#	src/main/resources/public/pages/project/groupproject/groupProjectEditView.html
#	src/main/resources/public/pages/project/groupproject/groupProjectView.html
#	src/main/resources/public/pages/project/project/projectAddViews.html
#	src/main/resources/public/pages/project/project/projectController.js
#	src/main/resources/public/pages/project/project/projectEditViews.html
#	src/main/resources/public/pages/project/project/projectListViews.html
#	src/main/resources/public/pages/timesheet/timeSheetController.js
#	src/main/resources/public/pages/timesheet/timeSheetDetailController.js
#	src/main/resources/public/pages/timesheet/timesheet.html

# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/QuantrivanphongApplication.java
#	src/main/java/com/itsol/quantrivanphong/manager/employee/controller/EmployeeController.java
#	src/main/resources/application.properties
#	src/main/resources/public/css/style.css
#	src/main/resources/public/index.html
#	src/main/resources/public/js/angular.min.js
#	src/main/resources/public/js/app.js
#	src/main/resources/public/layout/layout1.html
#	src/main/resources/public/layout/layout2.html
#	src/main/resources/public/layout/layout3.html
#	src/main/resources/public/pages/employee/employeeController.js
#	src/main/resources/public/pages/timesheet/timesheetController.js

# Conflicts:
#	pom.xml
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/angular-resource.js
#	src/main/resources/public/js/app.js
#	src/main/resources/public/layout/layout2.html
#	src/main/resources/public/layout/layout3.html

# Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js

# Conflicts:
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js

# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/repository/TimeSheetRepository.java
#	src/main/resources/application.properties
#	src/main/resources/public/index.html
#	src/main/resources/public/js/app.js
#	src/main/resources/public/pages/timesheet/timesheet.html
#	src/main/resources/public/pages/timesheet/timesheetController.js

# Conflicts:
#	src/main/java/com/itsol/quantrivanphong/manager/reportdetail/bussiness/ReportProjectBussiness.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/controller/TimeSheetController.java
#	src/main/java/com/itsol/quantrivanphong/report/timesheet/dto/TimeSheetDTO.java
#	src/main/resources/application.properties