# Conflicts:
#	.idea/workspace.xml
#	service-campaign.iml
#	src/main/java/com/viettel/campaign/repository/ApParamRepository.java
#	src/main/java/com/viettel/campaign/service/ApParamService.java
#	src/main/java/com/viettel/campaign/web/controller/KafkaController.java
#	src/main/resources/application.yml