Commit dc7e1c5
committed
Merge branch 'main' into MPC-134-Deleting-item-in-library-and-streaming
# Conflicts:
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$1.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$2.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$3.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$4.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$5.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$6.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$7.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$8.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$9.class
# Android/Layout_Version/app/build/intermediates/javac/debug/classes/com/example/layout_version/Saving_Policy_Page$SaveDataTask.class
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$1.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$2.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$3.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$4.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$5.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$6.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$7.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$8.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$9.dex
# Android/Layout_Version/app/build/intermediates/project_dex_archive/debug/out/com/example/layout_version/Saving_Policy_Page$SaveDataTask.dex
# Android/Layout_Version/app/src/main/java/com/example/layout_version/MainActivity.java
# Android/Layout_Version/app/src/main/java/com/example/layout_version/Network/NetworkRequestManager.javaFile tree
474 files changed
+9881
-8089
lines changed- Android/Layout_Version
- .gradle
- 7.5
- checksums
- executionHistory
- fileHashes
- buildOutputCleanup
- .idea
- 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
- mergeExtDexDebug
- 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
- 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
- MainTab/Streaming
- Network
- SenderStream
- res
- drawable
- layout
- values
- Network/Lambda
- Database/Data
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
474 files changed
+9881
-8089
lines changedBinary 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.
Binary file not shown.
Binary file not shown.
0 commit comments