Projects >> AndroidApp >>61cfb1b1f03c2cf6bcc99e91081c30fa82148fef

Chunk
Conflicting content 
   }
   
   public String GetNewVideoURL() {
<<<<<<< HEAD
	   return Data.videoFolderPath() + "/video_" + GetNewTimeAndUuid() + ".mp4";
=======
	   return videoFolderPath() + "/video_" + GetNewTimeAndUuid() + ".jpg";
>>>>>>> 39dad47544e1e75b86c19454d14bd905703b8f91
   }
   
   public String[] GetPhotoURLs() {
Solution content 
   }
   
   public String GetNewVideoURL() {
	   return videoFolderPath() + "/video_" + GetNewTimeAndUuid() + ".mp4";
   }
   
   public String[] GetPhotoURLs() {
File
Data.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement