Merge branch 'develop'
# Conflicts:
# .gradle/8.0/executionHistory/executionHistory.bin
# .gradle/8.0/executionHistory/executionHistory.lock
# .gradle/8.0/fileHashes/fileHashes.bin
# .gradle/8.0/fileHashes/fileHashes.lock
# .gradle/buildOutputCleanup/buildOutputCleanup.lock
# .gradle/buildOutputCleanup/outputFiles.bin
# .gradle/file-system.probe
# app/build/intermediates/apk/debug/app-debug.apk
# app/build/intermediates/dex_archive_input_jar_hashes/debug/out
# app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
# app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
# app/build/intermediates/incremental/debug/packageDebugResources/merger.xml
# app/build/intermediates/incremental/mergeDebugAssets/merger.xml
# app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
# app/build/intermediates/incremental/mergeDebugShaders/merger.xml
# app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
# app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
# app/build/intermediates/source_set_path_map/debug/file-map.txt
# app/build/outputs/logs/manifest-merger-debug-report.txt
# app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
# res/values/styles.xml
# src/net/micode/notes/gtask/data/MetaData.java
# src/net/micode/notes/gtask/data/Node.java
# src/net/micode/notes/gtask/data/SqlData.java
# src/net/micode/notes/gtask/data/SqlNote.java
# src/net/micode/notes/gtask/data/Task.java
# src/net/micode/notes/gtask/data/TaskList.java
|
ZYP