# Conflicts:
#	src/main/java/com/viettel/campaign/repository/CampaignRepository.java
#	src/main/java/com/viettel/campaign/service/impl/CampaignServiceImpl.java
#	src/main/java/com/viettel/campaign/service/impl/CustomerServiceImpl.java
#	src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java