src

2 years ago · 96fc29b373
parent a2efbb84fc
commit 96fc29b373
8 changed files with 2 additions and 10 deletions
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.bin
--- a/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
+++ b/src/Notes-master/.gradle/7.5/executionHistory/executionHistory.lock
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.bin
--- a/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
+++ b/src/Notes-master/.gradle/7.5/fileHashes/fileHashes.lock
--- a/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/src/Notes-master/.gradle/file-system.probe
+++ b/src/Notes-master/.gradle/file-system.probe
--- a/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
+++ b/src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#Fri Jun 09 13:55:24 CST 2023
-=======
-#Fri Jun 09 13:52:07 CST 2023
->>>>>>> 526d72ab877dcb7e21ef1a1494f52607cdf4104f
+#Fri Jun 09 21:03:20 CST 2023
 net.micode.notes.app-main-7\:/drawable-hdpi/call_record.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_green.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat
 net.micode.notes.app-main-7\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat
--- a/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+++ b/src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
@ -1,8 +1,4 @@
-<<<<<<< HEAD
-#Fri Jun 09 13:55:39 CST 2023
-=======
-#Fri Jun 09 13:52:20 CST 2023
->>>>>>> 526d72ab877dcb7e21ef1a1494f52607cdf4104f
+#Fri Jun 09 21:03:33 CST 2023
 base.0=D\:\\programming\\gitProject1\\src\\Notes-master\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
 renamed.0=classes.dex
 path.0=classes.dex