# Conflicts:
#	pom.xml
#	src/main/java/com/itsol/quantrivanphong/report/employee/Test.java
#	src/main/resources/application.properties