From c9a5973363821c5e633fe915b9f33844df43b59d Mon Sep 17 00:00:00 2001
From: songhp <songhp@ujs.edu.cn>
Date: Thu, 25 Aug 2022 17:18:49 +0800
Subject: [PATCH] clear code

---
 DateTimePickerDialog.java | 2 +-
 git.txt                   | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/DateTimePickerDialog.java b/DateTimePickerDialog.java
index 2c47ba4..5467212 100644
--- a/DateTimePickerDialog.java
+++ b/DateTimePickerDialog.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package net.micode.notes.ui;
+//package net.micode.notes.ui;
 
 import java.util.Calendar;
 
diff --git a/git.txt b/git.txt
index 0e44a03..074483b 100644
--- a/git.txt
+++ b/git.txt
@@ -1,11 +1,5 @@
 git show
 111
-<<<<<<< HEAD
 222
-
-=======
 333
-222
-
-
->>>>>>> a-branch
+a-branch