clear code

Merge branch 'a-branch'
# Conflicts: # git.txt
2 changed files with 3 additions and 4 deletions
--- 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;

--- a/git.txt
+++ b/git.txt
@ -1,6 +1,5 @@
 git show
 111
-333
 222
-
-
+333
+a-branch
Author	SHA1	Message	Date
songhp	c9a5973363	clear code	3 years ago
songhp	257b4e32d0	Merge branch 'a-branch' # Conflicts: # git.txt	3 years ago
songhp	ad078096de	111	3 years ago