Projects >> cgeo >>e21a54ee0490f89c1acf45adb41213e6c63836ba

Chunk
Conflicting content
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
<<<<<<< HEAD
import java.io.IOException;
=======
>>>>>>> 387c7ccdd7136c1ec8aaaf3792b87a510f6e10e3
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
Solution content
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
File
ImageUtils.java
Developer's decision
Version 1
Kind of conflict
Import