clear code

3 years ago · c9a5973363
parent 257b4e32d0
commit c9a5973363
2 changed files with 2 additions and 8 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,11 +1,5 @@
 git show
 111
 <<<<<<< HEAD
 222
 =======
 333
-222
+a-branch
 >>>>>>> a-branch