# Conflicts:
#	pom.xml
#	src/main/java/com/itsol/quantrivanphong/employee/bussiness/EmployeeBussiness.java
#	src/main/java/com/itsol/quantrivanphong/manage/leaveform/repository/EmployeeRepository.java
#	src/main/resources/application.properties
#	src/main/resources/public/js/angular.min.js