Commit ecaecd7
committed
Merge remote-tracking branch 'origin/main' into MPC-134-Deleting-item-in-library-and-streaming
# Conflicts:
# Android/Layout_Version/.gradle/7.5/executionHistory/executionHistory.bin
# Android/Layout_Version/.gradle/7.5/executionHistory/executionHistory.lock
# Android/Layout_Version/.gradle/7.5/fileHashes/fileHashes.bin
# Android/Layout_Version/.gradle/7.5/fileHashes/fileHashes.lock
# Android/Layout_Version/.gradle/7.5/fileHashes/resourceHashesCache.bin
# Android/Layout_Version/.gradle/buildOutputCleanup/buildOutputCleanup.lock
# Android/Layout_Version/.gradle/file-system.probe
# Android/Layout_Version/.idea/workspace.xml
# Android/Layout_Version/app/build/intermediates/apk/debug/app-debug.apk
# Android/Layout_Version/app/build/intermediates/dex/debug/mergeProjectDexDebug/10/classes.dex
# Android/Layout_Version/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/MainActivity.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page.class
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/MainActivity.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page.dex
# Android/Layout_Version/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
# Android/Layout_Version/app/src/main/java/com/example/layout_version/Account/Account_Page.java
# Android/Layout_Version/app/src/main/java/com/example/layout_version/Bluetooth/BluetoothManager.java
# Android/Layout_Version/app/src/main/java/com/example/layout_version/MainActivity.javaFile tree
210 files changed
+8937
-8528
lines changed- .idea
- Android/Layout_Version
- .gradle
- 7.5
- executionHistory
- fileHashes
- buildOutputCleanup
- .idea
- modules/app
- app
- build
- intermediates
- apk/debug
- compile_and_runtime_not_namespaced_r_class_jar/debug
- dex_archive_input_jar_hashes/debug
- dex_number_of_buckets_file/debug
- dex/debug/mergeProjectDexDebug
- 0
- 10
- incremental
- debug-mergeJavaRes
- debug
- mergeDebugResources
- packageDebugResources
- mergeDebugAssets
- mergeDebugJniLibFolders
- mergeDebugShaders
- packageDebug/tmp/debug
- zip-cache
- javac/debug/classes/com/example/layout_version
- local_only_symbol_list/debug
- manifest_merge_blame_file/debug
- merged_manifests/debug
- merged_manifest/debug
- merged_res_blame_folder/debug/out
- multi-v2
- single
- merged_res/debug
- packaged_manifests/debug
- packaged_res/debug
- layout
- values
- processed_res/debug/out
- project_dex_archive/debug/out/com/example/layout_version
- runtime_symbol_list/debug
- source_set_path_map/debug
- stable_resource_ids_file/debug
- symbol_list_with_package_name/debug
- outputs/logs
- tmp/compileDebugJavaWithJavac
- src/main
- java/com/example/layout_version
- Account
- Bluetooth
- MainTab/Streaming
- res
- drawable
- layout
- values
- Network/Lambda
- Database
- Data
- Raspberry Pi
- documentation/docs/development-plan
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
210 files changed
+8937
-8528
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments