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/file-system.probe
# app/build/intermediates/apk/debug/app-debug.apk
# app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
# app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
# app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties
# app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
# app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
# 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.json
# app/build/intermediates/processed_res/debug/out/resources-debug.ap_
# app/build/outputs/apk/debug/app-debug.apk
|
ZYP