commit

src/main/java/com/viettel/campaign/service/CustomerService.java

@@ -40,11 +40,7 @@ public interface CustomerService {
 
     // ------------ customer contact ------------ //
 
-<<<<<<< HEAD
-=======
     ResultDTO getCustomerContact(CustomerContactDTO customer);
-
->>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3
     // danh sach khach hang cua chien dich //
 
     ResultDTO searchCustomerListInfoFromCustomerList(int page, int pageSize, String sort, Long campaignId, Long companySiteId);

src/main/java/com/viettel/campaign/web/rest/CampaignController.java

@@ -9,10 +9,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-<<<<<<< HEAD:src/main/java/com/viettel/campaign/web/rest/controller/CampaignController.java
 import org.springframework.cloud.sleuth.instrument.reactor.ReactorSleuth;
-=======
->>>>>>> 1e6b797350a4aab62031bb2ede27d0beb4dc3bb3:src/main/java/com/viettel/campaign/web/rest/CampaignController.java
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;