Merge branch 'main' of https://bdgit.educoder.net/pqefjimyf/MiNote
# Conflicts:
# src/Notes-master1/.gradle/8.0/checksums/checksums.lock
# src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin
# src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin
# src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin
# src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock
# src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin
# src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock
# src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin
# src/Notes-master1/.gradle/file-system.probe
# src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk
# src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
# src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
# src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
# src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
# src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
# src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
# src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
# src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt
# src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt
# src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
|
zhangyimai
mhl
dingxinnan