pjamoh6iq
/
travelguideProject
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pjamoh6iq:1acff0412ef18ea7521775ab7c125e9e678ef0b4
Branches Tags
pjamoh6iq:master
pjamoh6iq:develop
pjamoh6iq:ZhuQingRui_Branch
pjamoh6iq:KangJiangLong_Branch
pjamoh6iq:HanJiaHui_Branch
pjamoh6iq:YuYouShui_Branch
...
compare: pjamoh6iq:45a79265add3f780980568df2834e6e060d79c8c
Branches Tags
pjamoh6iq:master
pjamoh6iq:develop
pjamoh6iq:ZhuQingRui_Branch
pjamoh6iq:KangJiangLong_Branch
pjamoh6iq:HanJiaHui_Branch
pjamoh6iq:YuYouShui_Branch

4 Commits
1acff0412e ... 45a79265ad

Author SHA1 Message Date
康江龙 45a79265ad Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into KangJiangLong_Branch
2 years ago
黎超凡 ad4150daaf 1
2 years ago
黎超凡 314c3e0042 1
2 years ago
黎超凡 a086c34bf8 develop
2 years ago
172 changed files with 1102 additions and 1871 deletions
Show Stats

2
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/.filecache
View File

File diff suppressed because one or more lines are too long

BIN
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/app.dill
View File

Binary file not shown.

2
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/debug_android_application.stamp
View File

File diff suppressed because one or more lines are too long

2
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/flutter_assets.d
View File

File diff suppressed because one or more lines are too long

2
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/kernel_snapshot.d
View File

File diff suppressed because one or more lines are too long

2
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/kernel_snapshot.stamp
View File

File diff suppressed because one or more lines are too long

2
src/.dart_tool/flutter_build/73ad0c3a968a1eeb9647bffe91993129/outputs.json
Unescape View File

@ -1 +1 @@
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection3.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection4.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]
["E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/1F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/2F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/3F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/4F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/5F.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection0.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection3.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/collection4.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service1.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/service2.png","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","E:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]

105
src/.dart_tool/package_config.json
Unescape View File

@ -3,55 +3,76 @@
"packages": [
{
"name": "async",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "boolean_selector",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "characters",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "clock",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "collection",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
<<<<<<< HEAD
"name": "cupertino_icons",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6",
@ -68,151 +89,196 @@
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"name": "fake_async",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "flutter",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///D:/flutter/flutter/packages/flutter",
=======
"rootUri": "file:///D:/flutter_windows_3.13.3-stable/flutter/packages/flutter",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///E:/flutter/packages/flutter",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "flutter_lints",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.19"
},
{
"name": "flutter_test",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///D:/flutter/flutter/packages/flutter_test",
=======
"rootUri": "file:///D:/flutter_windows_3.13.3-stable/flutter/packages/flutter_test",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///E:/flutter/packages/flutter_test",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "lints",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "matcher",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "material_color_utilities",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.17"
},
{
"name": "meta",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "path",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "sky_engine",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///D:/flutter/flutter/bin/cache/pkg/sky_engine",
=======
"rootUri": "file:///D:/flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///E:/flutter/bin/cache/pkg/sky_engine",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "source_span",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "sqflite",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "sqflite_common",
<<<<<<< HEAD
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "stack_trace",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "stream_channel",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "string_scanner",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0",
=======
@ -223,6 +289,9 @@
{
"name": "synchronized",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
@ -235,41 +304,57 @@
},
{
"name": "term_glyph",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.12"
},
{
"name": "test_api",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "vector_math",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "2.14"
},
{
"name": "web",
<<<<<<< HEAD
<<<<<<< HEAD
"rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta",
=======
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"packageUri": "lib/",
"languageVersion": "3.1"
},
@ -280,6 +365,7 @@
"languageVersion": "3.1"
}
],
<<<<<<< HEAD
<<<<<<< HEAD
"generated": "2023-10-17T15:13:10.404620Z",
=======
@ -289,6 +375,9 @@
"generated": "2023-10-17T14:06:28.851103Z",
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"generated": "2023-10-17T15:54:52.185007Z",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"generator": "pub",
"generatorVersion": "3.1.1"
}

116
src/.dart_tool/package_config_subset
Unescape View File

@ -1,6 +1,7 @@
async
2.18
<<<<<<< HEAD
<<<<<<< HEAD
file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/
file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib/
boolean_selector
@ -98,68 +99,56 @@ file:///D:/flutter/flutter/packages/flutter_test/lib/
=======
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib/
=======
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib/
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
boolean_selector
2.17
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/
characters
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib/
clock
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/
collection
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/
cupertino_icons
2.19
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/
fake_async
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/
flutter_lints
2.19
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib/
lints
3.0
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib/
matcher
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib/
material_color_utilities
2.17
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib/
meta
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib/
path
2.12
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/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
file:///C:/Users/17651/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/
sqflite
3.0
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/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/
=======
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
@ -170,63 +159,58 @@ 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/
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
stack_trace
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib/
stream_channel
2.14
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/
file:///C:/Users/17651/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/
synchronized
2.18
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/
=======
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/
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
term_glyph
2.12
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/
test_api
2.18
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib/
vector_math
2.14
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/
web
3.1
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/
file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/
file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib/
sky_engine
3.0
file:///D:/flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine/
file:///D:/flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine/lib/
file:///E:/flutter/bin/cache/pkg/sky_engine/
file:///E:/flutter/bin/cache/pkg/sky_engine/lib/
flutter
3.0
file:///D:/flutter_windows_3.13.3-stable/flutter/packages/flutter/
file:///D:/flutter_windows_3.13.3-stable/flutter/packages/flutter/lib/
file:///E:/flutter/packages/flutter/
file:///E:/flutter/packages/flutter/lib/
flutter_test
3.0
<<<<<<< HEAD
file:///D:/flutter_windows_3.13.3-stable/flutter/packages/flutter_test/
file:///D:/flutter_windows_3.13.3-stable/flutter/packages/flutter_test/lib/
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
file:///E:/flutter/packages/flutter_test/
file:///E:/flutter/packages/flutter_test/lib/
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
travelguide
3.1
file:///D:/travelguideProject/src/
file:///D:/travelguideProject/src/lib/
file:///E:/travelguideProject/src/
file:///E:/travelguideProject/src/lib/
2

4
src/.flutter-plugins
Unescape View File

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

6
src/.flutter-plugins-dependencies
Unescape View File

@ -1,5 +1 @@
<<<<<<< HEAD
{"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-17 23:37:06.534861","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\\\\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-17 22:31:12.840798","version":"3.13.3"}
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
{"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-17 23:55:05.759151","version":"3.13.3"}

1632
src/.idea/dataSources/e0ede5d9-8294-4b67-a394-2fc6c7a89d03.xml
View File

File diff suppressed because it is too large Load Diff

26
src/.idea/libraries/Dart_Packages.xml
Unescape View File

@ -37,13 +37,6 @@
</list>
</value>
</entry>
<entry key="cupertino_icons">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib" />
</list>
</value>
</entry>
<entry key="fake_async">
<value>
<list>
@ -54,11 +47,15 @@
<entry key="flutter">
<value>
<list>
<<<<<<< HEAD
<<<<<<< HEAD
<option value="$PROJECT_DIR$/../../flutter/flutter/packages/flutter/lib" />
=======
<option value="$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter/lib" />
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
<option value="$PROJECT_DIR$/../../flutter/packages/flutter/lib" />
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
</list>
</value>
</entry>
@ -72,11 +69,15 @@
<entry key="flutter_test">
<value>
<list>
<<<<<<< HEAD
<<<<<<< HEAD
<option value="$PROJECT_DIR$/../../flutter/flutter/packages/flutter_test/lib" />
=======
<option value="$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter_test/lib" />
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
<option value="$PROJECT_DIR$/../../flutter/packages/flutter_test/lib" />
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
</list>
</value>
</entry>
@ -118,11 +119,15 @@
<entry key="sky_engine">
<value>
<list>
<<<<<<< HEAD
<<<<<<< HEAD
<option value="$PROJECT_DIR$/../../flutter/flutter/bin/cache/pkg/sky_engine/lib" />
=======
<option value="$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine/lib" />
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
<option value="$PROJECT_DIR$/../../flutter/bin/cache/pkg/sky_engine/lib" />
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
</list>
</value>
</entry>
@ -211,7 +216,6 @@
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" />
@ -230,6 +234,7 @@
<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" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib" />
<<<<<<< HEAD
<<<<<<< HEAD
<root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/pkg/sky_engine/lib" />
<root url="file://$PROJECT_DIR$/../../flutter/flutter/packages/flutter/lib" />
@ -239,6 +244,11 @@
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter/lib" />
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/packages/flutter_test/lib" />
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/pkg/sky_engine/lib" />
<root url="file://$PROJECT_DIR$/../../flutter/packages/flutter/lib" />
<root url="file://$PROJECT_DIR$/../../flutter/packages/flutter_test/lib" />
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
</CLASSES>
<JAVADOC />
<SOURCES />

24
src/.idea/libraries/Dart_SDK.xml
Unescape View File

@ -1,6 +1,7 @@
<component name="libraryTable">
<library name="Dart SDK">
<CLASSES>
<<<<<<< HEAD
<<<<<<< HEAD
<root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/cli" />
@ -46,6 +47,29 @@
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/web_gl" />
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/async" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/core" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/html" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/io" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_interop" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/math" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/web_gl" />
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
</CLASSES>
<JAVADOC />
<SOURCES />

2
src/build/app/intermediates/assets/debug/flutter_assets/AssetManifest.bin
Unescape View File

@ -1 +1 @@
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/3F.png assets/4F.png  asset assets/4F.png assets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/3F.png assets/4F.png  asset assets/4F.png assets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png

2
src/build/app/intermediates/assets/debug/flutter_assets/AssetManifest.json
Unescape View File

@ -1 +1 @@
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"]}

2
src/build/app/intermediates/assets/debug/flutter_assets/FontManifest.json
Unescape View File

@ -1 +1 @@
[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}]
[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]}]

BIN
src/build/app/intermediates/assets/debug/flutter_assets/NOTICES.Z
View File

Binary file not shown.

BIN
src/build/app/intermediates/assets/debug/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf
View File

Binary file not shown.

BIN
src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/AssetManifest.bin.jar
View File

Binary file not shown.

BIN
src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/AssetManifest.json.jar
View File

Binary file not shown.

BIN
src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/FontManifest.json.jar
View File

Binary file not shown.

BIN
src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/NOTICES.Z.jar
View File

Binary file not shown.

BIN
src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf.jar
View File

Binary file not shown.

2
src/build/app/intermediates/flutter/debug/.last_build_id
Unescape View File

@ -1 +1 @@
99d422f60ec3de076ff7e456d1ef6bf5
73ad0c3a968a1eeb9647bffe91993129

2
src/build/app/intermediates/flutter/debug/flutter_assets/AssetManifest.bin
Unescape View File

@ -1 +1 @@
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/3F.png assets/4F.png  asset assets/4F.png assets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png2packages/cupertino_icons/assets/CupertinoIcons.ttf  asset2packages/cupertino_icons/assets/CupertinoIcons.ttf
 assets/1F.png  asset assets/1F.png assets/2F.png  asset assets/2F.png assets/3F.png  asset assets/3F.png assets/4F.png  asset assets/4F.png assets/5F.png  asset assets/5F.pngassets/Collection_Preview.jpg  assetassets/Collection_Preview.jpgassets/Museum_Preview.jpg  assetassets/Museum_Preview.jpgassets/collection0.png  assetassets/collection0.pngassets/collection1.png  assetassets/collection1.pngassets/collection2.png  assetassets/collection2.pngassets/collection3.png  assetassets/collection3.pngassets/collection4.png  assetassets/collection4.pngassets/service1.png  assetassets/service1.pngassets/service2.png  assetassets/service2.png

2
src/build/app/intermediates/flutter/debug/flutter_assets/AssetManifest.json
Unescape View File

@ -1 +1 @@
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]}
{"assets/1F.png":["assets/1F.png"],"assets/2F.png":["assets/2F.png"],"assets/3F.png":["assets/3F.png"],"assets/4F.png":["assets/4F.png"],"assets/5F.png":["assets/5F.png"],"assets/Collection_Preview.jpg":["assets/Collection_Preview.jpg"],"assets/Museum_Preview.jpg":["assets/Museum_Preview.jpg"],"assets/collection0.png":["assets/collection0.png"],"assets/collection1.png":["assets/collection1.png"],"assets/collection2.png":["assets/collection2.png"],"assets/collection3.png":["assets/collection3.png"],"assets/collection4.png":["assets/collection4.png"],"assets/service1.png":["assets/service1.png"],"assets/service2.png":["assets/service2.png"]}

2
src/build/app/intermediates/flutter/debug/flutter_assets/FontManifest.json
Unescape View File

@ -1 +1 @@
[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}]
[{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]}]

BIN
src/build/app/intermediates/flutter/debug/flutter_assets/NOTICES.Z
View File

Binary file not shown.

BIN
src/build/app/intermediates/flutter/debug/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf
View File

Binary file not shown.

4
src/build/app/intermediates/flutter/debug/flutter_build.d
View File

File diff suppressed because one or more lines are too long

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/V9b_Om1ptfpJr9xJyP5GfCAzLWo= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1ohE4sB6Dwzmw+57nNm9pqj55yY=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZpkDOS0d8oOWzs7vtcfgeWMPgco= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/89SeLvgB6zv9PXd3EyHdTCMHmnk=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/awbZFJsHE+7EME9bKTXZBtcl53A= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/8QdTi_LNuCx9_miuFMuUQS329Ho=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZM0wDz9U6fiFq5PQmoWeR_ZkXQ0= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/APV1oVU1Qmx1+xO8WcEca1bDHpo=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/avioooMiU2PCP6ZlsOcws+LDKds= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/DX7l3gS4NM0E0tllBYF3jl4m2Zg=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/9w1U0pl6y3jlslqw_9B_egasalc= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/E7SW9VPf_UML56jM3_Yw5iRqut0=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xg_lu9CKdw2qNCIe0dJmHLQIbU4= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/GQeVIHgjq7uqIpYoDgS2mVde0DE=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1F+n0k6DZ4JptcAx1XScP658CrI= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/HZRwHvaPAFpGaPJxFo3JrGxVhJc=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RMFlAPuaHMqkY576r3UvrgxG7BI= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LpgFH5P7F5hsrB4KWxd2zp5IilA=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/nQf5R_+ymVAGsNufxvsGdUhIR7A= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LrIdAwKNNY4BNk0S7WA4tnV7UdM=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/UysC6fQK04HVgXOy8Qaks1TDSU8= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/M33rpO38ZKjOf94fjZ39L6j0PJY=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/3YngtZOBDU2aW7cip9L5d1yjfE4= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/N2s8SJdmcmTMtWBC7ICjHQzll6w=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1+k56PqPL+yZXyNpf3MLyGoZHag= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/PvI8PYLx1G2x2qXI4LmD11oAQQo=
Unescape View File

BIN
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Q2aK16mnN51REQ5J71yXJaVEY40= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/QxjslUHL3MvCKlwoX0Jmlatp2sY=
View File

Binary file not shown.

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/xfYT860cjKi_XOPpiKxDpm5IMzg= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/VBiHSEx25Ju+wiTjTFPIJBiSPGM=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/iUVGBbdfjhQopRgfdnT5A2QTnl0= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/WWHR_bY05hvAM3AWYtbMqZqD1rc=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/FDXmCNvjU1WbLv21hw6fC123ypk= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Wo4lBQTB4E1CY0968BjZM2QrGFg=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/b5Xf486Qj63IdAxOpLAbr38B_Rg= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xjp62i4a9IKlLbBTwvHqPPYn9Sc=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1D9rtkv9IQI6ikzv2ZwzBWjgHZw= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/_e5POg7bMrqboLyNL48fwouKdkA=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/XRmo3o36gdt6Yg8OyFEzd9FNI2g= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/afEwPEGZzgB3nGDoGf6C63mUrBA=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/CChI0RWJH+ylPAqraRFPgelFOio= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/bswIdob_5t3zwZSYY3ooXliJbFA=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/So4fzxS+KKwQj2oxV25qMmY1tiw= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eS_Pdl0fKRw6JpraA2OV7Qp+WaI=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/qukBQUa63iW9ux76_pB1ltq9H8Y= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/fyGrtsW8xZ3HYAEedmBf4LpKSQI=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/KAdoV_imWRf4DYnNlzHlhaATidg= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/hmGUEPJJNTNLNsEGdUMNuqXXQLU=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Et2FTjxJ6dTekT5lyvqwv8Q20m4= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/i9JaTA4As7rNOuXoFojkcz+W2D4=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eB1bVS6pJ24YZ11_zUHiNwfDedU= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/jndTM_yFVgRgFzUGPtGG5zCgBso=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/gbmLKhBWBvG84LJJ+8DtmGi70qw= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/leSPJxn1OjIaBM2F5AJySsu_jSc=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RmUk3OTIDHiloSG6QlA9lb0GYUI= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/m0VXB6ZPwOrS9XARhKpdjWCD8cU=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eLHxGftB4vMbnplZ4rZbZcae2oA= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/mBQoV_JZWp5WUM4Sq9NBQm+VwHA=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wXP+AAh5exPs4fwXVhFzmqpQQaU= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ozCMBMB1okeaYbxhITcz9vY05vY=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/dNDmEFdDQPlZtURgxAO44x6t2r0= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/qM2edB8etWN2FHgcQxW5k5ifOrA=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/dgpo4ieOOV474ZW9eYqx06JyEJo= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/raIMpdhAOuEsj9RfL8rv5irthws=
Unescape View File

0
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/4kGSiE8wN2FLMYQ9kSnKhFWg1wc= → src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wJBkdPd7MB8UlpyGU_piIOIIyEA=
Unescape View File

BIN
src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zflDT7PXjd9iyTO8EGeysxDQsQ4=
View File

Binary file not shown.

7
src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD
<<<<<<< HEAD
#Tue Oct 17 19:50:03 CST 2023
=======
<<<<<<< HEAD
@ -15,6 +16,9 @@ com.example.travelguide.app-main-5\:/mipmap-hdpi/ic_launcher.png=D\:\\travelguid
=======
=======
#Tue Oct 17 22:07:14 CST 2023
=======
#Tue Oct 17 23:55:25 CST 2023
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
com.example.travelguide.app-main-5\:/mipmap-xxxhdpi/ic_launcher.png=E\:\\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=E\:\\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=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.png.flat
@ -22,5 +26,8 @@ com.example.travelguide.app-main-5\:/drawable-v21/launch_background.xml=E\:\\tra
com.example.travelguide.app-main-5\:/mipmap-xhdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.png.flat
com.example.travelguide.app-main-5\:/drawable/launch_background.xml=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\drawable_launch_background.xml.flat
com.example.travelguide.app-main-5\:/mipmap-hdpi/ic_launcher.png=E\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat
<<<<<<< HEAD
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f

20
src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

4
src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
Unescape View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<<<<<<< HEAD
<<<<<<< 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>
=======
<<<<<<< HEAD
@ -8,3 +9,6 @@
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\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="E:\travelguideProject\src\android\app\src\main\assets"/><source path="E:\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="E:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
<merger version="3"><dataSet config=":sqflite" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="E:\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="E:\travelguideProject\src\android\app\src\main\assets"/><source path="E:\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="E:\travelguideProject\src\android\app\src\debug\assets"/></dataSet></merger>
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f

5
src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
Unescape View File

@ -1,4 +1,5 @@
<<<<<<< HEAD
<<<<<<< HEAD
#Tue Oct 17 23:13:31 CST 2023
base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
=======
@ -10,5 +11,9 @@ base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\merg
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
#Tue Oct 17 23:55:32 CST 2023
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
renamed.0=classes.dex
path.0=classes.dex

24
src/build/app/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
Unescape View File

@ -13,17 +13,21 @@
13 to allow setting breakpoints, to provide hot reload, etc.
14 -->
15 <uses-permission android:name="android.permission.INTERNET" />
15-->D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
15-->D:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
15-->E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:5-66
15-->E:\travelguideProject\src\android\app\src\debug\AndroidManifest.xml:6:22-64
16
17 <application
18 android:name="android.app.Application"
19 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
<<<<<<< HEAD
<<<<<<< HEAD
19-->[androidx.core:core:1.6.0] C:\Users\康江龙\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
=======
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
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
19-->[androidx.core:core:1.6.0] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\7e9df2ac2213a6bd3cef0f2f27870d79\transformed\core-1.6.0\AndroidManifest.xml:24:18-86
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
20 android:debuggable="true"
21 android:icon="@mipmap/ic_launcher"
22 android:label="travelguide" >
@ -62,6 +66,7 @@
55
56 <uses-library
<<<<<<< HEAD
<<<<<<< HEAD
56-->[androidx.window:window:1.0.0-beta04] C:\Users\康江龙\.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\康江龙\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:26:13-54
@ -75,17 +80,24 @@
61-->[androidx.window:window:1.0.0-beta04] C:\Users\康江龙\.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\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
=======
56-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:25:9-27:40
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
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
57-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.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\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:27:13-37
58-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.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\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:28:9-30:40
59-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.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\86131\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:29:13-51
60-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:29:13-51
61 android:required="false" />
<<<<<<< HEAD
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
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
61-->[androidx.window:window:1.0.0-beta04] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:30:13-37
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
62 </application>
63
64</manifest>

408
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
View File

File diff suppressed because it is too large Load Diff

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-af/values-af.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-af\\values-af.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-am/values-am.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-am\\values-am.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-ar/values-ar.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ar\\values-ar.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-as/values-as.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-as\\values-as.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-az/values-az.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-az\\values-az.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-b+sr+Latn/values-b+sr+Latn.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-b+sr+Latn\\values-b+sr+Latn.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-be/values-be.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-be\\values-be.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bg/values-bg.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bg\\values-bg.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bn/values-bn.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bn\\values-bn.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-bs/values-bs.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-bs\\values-bs.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-ca/values-ca.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-ca\\values-ca.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-cs/values-cs.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-cs\\values-cs.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-da/values-da.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-da\\values-da.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-de/values-de.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-de\\values-de.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-el/values-el.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-el\\values-el.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rAU/values-en-rAU.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rAU\\values-en-rAU.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rCA/values-en-rCA.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rCA\\values-en-rCA.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rGB/values-en-rGB.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rGB\\values-en-rGB.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rGB\\values-en-rGB.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rGB\\values-en-rGB.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rIN/values-en-rIN.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rIN\\values-en-rIN.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rIN\\values-en-rIN.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rIN\\values-en-rIN.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-en-rXC/values-en-rXC.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rXC\\values-en-rXC.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rXC\\values-en-rXC.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-en-rXC\\values-en-rXC.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-es-rUS/values-es-rUS.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es-rUS\\values-es-rUS.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es-rUS\\values-es-rUS.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es-rUS\\values-es-rUS.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-es/values-es.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es\\values-es.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es\\values-es.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-es\\values-es.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-et/values-et.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-et\\values-et.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-et\\values-et.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-et\\values-et.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-eu/values-eu.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-eu\\values-eu.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-eu\\values-eu.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-eu\\values-eu.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-fa/values-fa.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fa\\values-fa.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fa\\values-fa.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fa\\values-fa.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-fi/values-fi.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fi\\values-fi.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fi\\values-fi.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fi\\values-fi.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-fr-rCA/values-fr-rCA.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fr-rCA\\values-fr-rCA.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-fr/values-fr.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fr\\values-fr.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fr\\values-fr.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-fr\\values-fr.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

4
src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
Unescape View File

@ -4,11 +4,15 @@
"outputFile": "com.example.travelguide.app-mergeDebugResources-9:/values-gl/values-gl.xml",
"map": [
{
<<<<<<< HEAD
<<<<<<< HEAD
"source": "C:\\Users\\康江龙\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-gl\\values-gl.xml",
=======
"source": "C:\\Users\\86131\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-gl\\values-gl.xml",
>>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
=======
"source": "E:\\AndroidTool\\AndroidGradle\\.gradle\\caches\\transforms-3\\7e9df2ac2213a6bd3cef0f2f27870d79\\transformed\\core-1.6.0\\res\\values-gl\\values-gl.xml",
>>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
"from": {
"startLines": "2",
"startColumns": "4",

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

Write Preview
Loading…
Cancel
Save