解决冲突

src/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" group="src" />
+    </modules>
+  </component>
+</project>

src/.idea/modules/Notes2.src.iml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="79037ebd-355b-42f7-b405-88331a1187c2" />
+  </component>
+</module>

src/.idea/modules/app/src.app.androidTest.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="SonarLintModuleSettings">
-    <option name="uniqueId" value="9d512367-cc80-48b7-85d7-1943b2a7a94c" />
+    <option name="uniqueId" value="6eeea971-fea1-4c30-bcb6-b027be3f31d5" />
   </component>
 </module>

src/.idea/modules/app/src.app.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="SonarLintModuleSettings">
-    <option name="uniqueId" value="0b091a8f-80fd-4c63-b21a-3a6868d6ab63" />
+    <option name="uniqueId" value="1a86053b-146b-42a5-8497-0be0da36dc3e" />
   </component>
 </module>

src/.idea/modules/app/src.app.main.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="SonarLintModuleSettings">
-    <option name="uniqueId" value="5387f3e1-53c6-477f-9522-acdaf8b0df87" />
+    <option name="uniqueId" value="724ff060-c9ac-42cc-bd6a-ed0ded87f992" />
   </component>
 </module>

src/.idea/modules/app/src.app.unitTest.iml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="SonarLintModuleSettings">
-    <option name="uniqueId" value="c13e4016-2950-4012-a9f6-886fd1feb0a0" />
+    <option name="uniqueId" value="ddc96dcd-0863-491b-9b6d-4de96aac5b36" />
   </component>
 </module>

src/.idea/src.iml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
   <component name="SonarLintModuleSettings">
     <option name="uniqueId" value="ee6a7ea8-8458-4f45-a628-153dc4e501b0" />
   </component>

src/.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>