2

src/DateTimePickerDialog.java

@@ -15,13 +15,9 @@
  */
 
 package net.micode.notes.ui;
-<<<<<<< HEAD
-import  111
-=======
-import 123.io
->>>>>>> 451447c268fe937bd6319adeb8d45dcad7a9a884
+import 123.io；；；；  
 import java.util.Calendar;
-import  222
+
 import net.micode.notes.R;
 import net.micode.notes.ui.DateTimePicker;
 import net.micode.notes.ui.DateTimePicker.OnDateTimeChangedListener;