第2次提交

README.md

@@ -1,5 +1,14 @@
+<<<<<<< HEAD
 # mydearest
 
+=======
+<<<<<<< HEAD
+# Flutter_First_Project
+
+=======
+# mydearest
+
+>>>>>>> f48a885 (第2次提交)
 A new Flutter project.
 
 ## Getting Started
@@ -14,3 +23,7 @@ A few resources to get you started if this is your first Flutter project:
 For help getting started with Flutter development, view the
 [online documentation](https://docs.flutter.dev/), which offers tutorials,
 samples, guidance on mobile development, and a full API reference.
+<<<<<<< HEAD
+=======
+>>>>>>> 4bb705a (第一次提交)
+>>>>>>> f48a885 (第2次提交)