no message

Backend/sample/src/main/java/com/dji/sample/media/service/IFileService.java

@@ -108,11 +108,7 @@ public interface IFileService {
 
     boolean deleteMediaElement(String workspaceId, MediaFileDTO mediaFileDTO);
 
-<<<<<<< HEAD
     PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(long page, long pageSize, Long startTime, Long endTime, String workspaceId, String deviceSn, String pictureType);
-=======
-    PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination( long page, long pageSize, Long startTime, Long endTime, String workspaceId, String deviceSn, String pictureType);
->>>>>>> 653378cf1247a1008f31a5a33e7d6fb80b5684ca
 
     UploadResultDTO uploadFile(MultipartFile file,String creator);