HanJiaHui_Branch
嘉辉 JIA HUI 2 years ago
parent bfd6c80d73
commit 280efa68cd

File diff suppressed because one or more lines are too long

@ -1 +1 @@
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\flutter_build\\99d422f60ec3de076ff7e456d1ef6bf5\\app.dill","D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter_tools\\lib\\src\\build_system\\targets\\icon_tree_shaker.dart","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\travelguideProject\\src\\pubspec.yaml","D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg","D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf","D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE","D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\LICENSE","D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD1004355602"],"outputs":["D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]}
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\flutter_build\\99d422f60ec3de076ff7e456d1ef6bf5\\app.dill","D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter_tools\\lib\\src\\build_system\\targets\\icon_tree_shaker.dart","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\internal\\engine.version","D:\\travelguideProject\\src\\pubspec.yaml","D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg","D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf","D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite_common-2.5.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\synchronized-3.1.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE","C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE","D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE","D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\LICENSE","D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD636562482"],"outputs":["D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]}

@ -1 +1 @@
D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD1004355602
D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z: D:\\travelguideProject\\src\\pubspec.yaml D:\\travelguideProject\\src\\assets\\Collection_Preview.jpg D:\\travelguideProject\\src\\assets\\Museum_Preview.jpg C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\assets\\CupertinoIcons.ttf D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\artifacts\\material_fonts\\MaterialIcons-Regular.otf D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\lib\\src\\material\\shaders\\ink_sparkle.frag C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\async-2.11.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\boolean_selector-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\characters-1.3.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\clock-1.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\collection-1.17.2\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\cupertino_icons-1.0.6\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\fake_async-1.3.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\flutter_lints-2.0.3\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\lints-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\matcher-0.12.16\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\material_color_utilities-0.5.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\meta-1.9.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\path-1.8.3\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\source_span-1.10.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite_common-2.5.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stack_trace-1.11.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\stream_channel-2.1.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\string_scanner-1.2.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\synchronized-3.1.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\term_glyph-1.2.1\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\test_api-0.6.0\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\vector_math-2.1.4\\LICENSE C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\web-0.1.4-beta\\LICENSE D:\\flutter_windows_3.13.3-stable\\flutter\\bin\\cache\\pkg\\sky_engine\\LICENSE D:\\flutter_windows_3.13.3-stable\\flutter\\packages\\flutter\\LICENSE D:\\travelguideProject\\src\\DOES_NOT_EXIST_RERUN_FOR_WILDCARD636562482

@ -1 +1 @@
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":[]}
{"inputs":["D:\\travelguideProject\\src\\.dart_tool\\package_config_subset"],"outputs":["D:\\travelguideProject\\src\\.dart_tool\\flutter_build\\dart_plugin_registrant.dart"]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -105,13 +105,13 @@
},
{
"name": "sqflite",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "sqflite_common",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
@ -135,7 +135,7 @@
},
{
"name": "synchronized",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
@ -170,11 +170,7 @@
"languageVersion": "3.1"
}
],
<<<<<<< HEAD
"generated": "2023-10-16T02:20:45.150497Z",
=======
"generated": "2023-10-16T02:07:01.224187Z",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"generated": "2023-10-16T02:42:09.019651Z",
"generator": "pub",
"generatorVersion": "3.1.1"
}

@ -52,21 +52,16 @@ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
source_span
2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
sqflite
3.0
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib/
sqflite_common
3.0
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib/
stack_trace
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
@ -77,17 +72,12 @@ file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/
string_scanner
2.18
<<<<<<< HEAD
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
synchronized
2.18
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib/
term_glyph
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/

@ -1,2 +1,2 @@
# This is a generated file; do not edit or check into version control.
sqflite=C:\\Users\\17651\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\
sqflite=C:\\Users\\86131\\AppData\\Local\\Pub\\Cache\\hosted\\pub.dev\\sqflite-2.3.0\\

@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\17651\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-16 10:07:01.373345","version":"3.13.3"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-16 10:42:15.845619","version":"3.13.3"}

@ -121,6 +121,20 @@
</list>
</value>
</entry>
<entry key="sqflite">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib" />
</list>
</value>
</entry>
<entry key="sqflite_common">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib" />
</list>
</value>
</entry>
<entry key="stack_trace">
<value>
<list>
@ -142,6 +156,13 @@
</list>
</value>
</entry>
<entry key="synchronized">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib" />
</list>
</value>
</entry>
<entry key="term_glyph">
<value>
<list>
@ -187,9 +208,12 @@
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" />

@ -1,6 +1,8 @@
<component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES />
<CLASSES>
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>

@ -26,5 +26,6 @@
<orderEntry type="library" name="Flutter for Android" level="project" />
<orderEntry type="library" name="KotlinJavaRuntime" level="project" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>

@ -1,5 +1 @@
<<<<<<< HEAD
99d422f60ec3de076ff7e456d1ef6bf5
=======
50a0596c359627165cfa4f6efaef3273
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
99d422f60ec3de076ff7e456d1ef6bf5

File diff suppressed because one or more lines are too long

@ -1,8 +1,4 @@
<<<<<<< HEAD
#Fri Oct 13 21:20:57 CST 2023
=======
#Fri Oct 13 21:33:15 CST 2023
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
#Mon Oct 16 10:36:05 CST 2023
com.example.travelguide.app-main-5\:/mipmap-xxxhdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/mipmap-xxhdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/mipmap-mdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat

File diff suppressed because one or more lines are too long

@ -1,6 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
=======
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\build\sqflite\intermediates\library_assets\debug\out"/></dataSet><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\main\assets"/><source path="D:\travelguideProject\src\build\app\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>

@ -1,14 +1,4 @@
<<<<<<< HEAD
#Fri Oct 13 21:21:10 CST 2023
#Mon Oct 16 10:39:25 CST 2023
base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
<<<<<<< HEAD
#Fri Oct 13 15:38:26 CST 2023
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
#Sun Oct 15 00:07:26 CST 2023
base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> 99f10a789f1d8550634d678f64e6e5e48b4a346d
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
renamed.0=classes.dex
path.0=classes.dex

@ -19,11 +19,7 @@
17 <application
18 android:name="android.app.Application"
19 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
<<<<<<< HEAD
19-->[androidx.core:core:1.6.0] C:\Users\86131\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
=======
19-->[androidx.core:core:1.6.0] C:\Users\Administrator\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
20 android:debuggable="true"
21 android:icon="@mipmap/ic_launcher"
22 android:label="travelguide" >
@ -61,7 +57,6 @@
54 android:value="2" />
55
56 <uses-library
<<<<<<< HEAD
56-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
57 android:name="androidx.window.extensions"
57-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:26:13-54
@ -73,19 +68,6 @@
60-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:29:13-51
61 android:required="false" />
61-->[androidx.window:window:1.0.0-beta04] C:\Users\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:30:13-37
=======
56-->[androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
57 android:name="androidx.window.extensions"
57-->[androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:26:13-54
58 android:required="false" />
58-->[androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:27:13-37
59 <uses-library
59-->[androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:28:9-30:40
60 android:name="androidx.window.sidecar"
60-->[androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:29:13-51
61 android:required="false" />
61-->[androidx.window:window:1.0.0-beta04] C:\Users\Administrator\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:30:13-37
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
62 </application>
63
64</manifest>

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-af/values-af.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-am/values-am.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-ar/values-ar.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-as/values-as.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-az/values-az.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-b+sr+Latn/values-b+sr+Latn.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-be/values-be.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bg/values-bg.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bn/values-bn.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bs/values-bs.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-ca/values-ca.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-cs/values-cs.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-da/values-da.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-de/values-de.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-el/values-el.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rAU/values-en-rAU.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rCA/values-en-rCA.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rGB/values-en-rGB.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rGB\\values-en-rGB.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rGB\\values-en-rGB.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rIN/values-en-rIN.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rIN\\values-en-rIN.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rIN\\values-en-rIN.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rXC/values-en-rXC.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rXC\\values-en-rXC.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rXC\\values-en-rXC.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-es-rUS/values-es-rUS.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es-rUS\\values-es-rUS.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es-rUS\\values-es-rUS.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-es/values-es.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es\\values-es.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es\\values-es.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-et/values-et.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-et\\values-et.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-et\\values-et.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-eu/values-eu.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-eu\\values-eu.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-eu\\values-eu.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-fa/values-fa.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fa\\values-fa.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fa\\values-fa.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

@ -4,11 +4,7 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-fi/values-fi.xml",
"map": [
{
<<<<<<< HEAD
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fi\\values-fi.xml",
=======
"source": "C:\\Users\\Administrator\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fi\\values-fi.xml",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"from": {
"startLines": "2",
"startColumns": "4",

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save