Merge branch 'main' of https://bdgit.educoder.net/p29304815/GitPractise into lisi_branch

# Conflicts:
#	README.md

README.md

@@ -1,2 +1,6 @@
 # GitPractise
+<<<<<<< HEAD
 lisi
+=======
+zhangsan
+>>>>>>> 3a35eae6b076aca03c24978ad5c8800579d45e80

src/DateTimePickerDialog.java

@@ -68,6 +68,10 @@ public class DateTimePickerDialog extends AlertDialog implements OnClickListener
         mIs24HourView = is24HourView;
     }
     
+    public void set12HourView(boolean is24HourView) {
+        mIs24HourView = is24HourView;
+    }
+
     public void setOnDateTimeSetListener(OnDateTimeSetListener callBack) {
         mOnDateTimeSetListener = callBack;
     }