2 changed files with 0 additions and 4 deletions
--- a/doc/文档模板-软件需求规格说明书模板.docx
+++ b/doc/文档模板-软件需求规格说明书模板.docx
--- a/src/DateTimePickerDialog.java
+++ b/src/DateTimePickerDialog.java
@ -15,11 +15,7 @@
 */

 package net.micode.notes.ui;
-<<<<<<< HEAD
 import  111
-=======
-import 123.io
->>>>>>> 451447c268fe937bd6319adeb8d45dcad7a9a884
 import java.util.Calendar;
 import  222
 import net.micode.notes.R;