代码

src/.dart_tool/package_config.json

@@ -3,236 +3,97 @@
   "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",
-=======
-      "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6",
->>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
-      "packageUri": "lib/",
-      "languageVersion": "2.19"
-    },
-    {
-      "name": "fake_async",
-<<<<<<< HEAD
-      "rootUri": "file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1",
-=======
-      "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"
     },
@@ -250,111 +111,49 @@
     },
     {
       "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",
-=======
-      "rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0",
-      "packageUri": "lib/",
-      "languageVersion": "2.18"
-    },
-    {
-      "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"
     },
     {
       "name": "synchronized",
       "rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
->>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
       "packageUri": "lib/",
       "languageVersion": "2.18"
     },
     {
       "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"
     },
@@ -365,19 +164,7 @@
       "languageVersion": "3.1"
     }
   ],
-<<<<<<< HEAD
-<<<<<<< HEAD
-  "generated": "2023-10-17T15:13:10.404620Z",
-=======
-<<<<<<< HEAD
-  "generated": "2023-10-17T13:12:11.527001Z",
-=======
-  "generated": "2023-10-17T14:06:28.851103Z",
->>>>>>> b3e9191f62a63dd34a67b874f663f99b9537752c
->>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
-=======
-  "generated": "2023-10-17T15:54:52.185007Z",
->>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
+  "generated": "2023-10-17T16:33:26.011261Z",
   "generator": "pub",
   "generatorVersion": "3.1.1"
 }

src/.dart_tool/package_config_subset

@@ -1,108 +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
-2.17
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib/
-characters
-2.12
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib/
-clock
-2.12
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib/
-collection
-2.18
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib/
-cupertino_icons
-2.19
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib/
-fake_async
-2.12
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib/
-flutter_lints
-2.19
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib/
-lints
-3.0
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib/
-matcher
-2.18
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib/
-material_color_utilities
-2.17
-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/
-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/lib/
-meta
-2.12
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib/
-path
-2.12
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib/
-source_span
-2.18
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib/
-stack_trace
-2.18
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib/
-stream_channel
-2.14
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib/
-string_scanner
-2.18
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib/
-term_glyph
-2.12
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib/
-test_api
-2.18
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib/
-vector_math
-2.14
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib/
-web
-3.1
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/
-file:///C:/Users/%E5%BA%B7%E6%B1%9F%E9%BE%99/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib/
-sky_engine
-3.0
-file:///D:/flutter/flutter/bin/cache/pkg/sky_engine/
-file:///D:/flutter/flutter/bin/cache/pkg/sky_engine/lib/
-flutter
-3.0
-file:///D:/flutter/flutter/packages/flutter/
-file:///D:/flutter/flutter/packages/flutter/lib/
-flutter_test
-3.0
-file:///D:/flutter/flutter/packages/flutter_test/
-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/17651/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/
@@ -201,14 +100,8 @@ 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:///E:/travelguideProject/src/

src/.flutter-plugins-dependencies

@@ -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-17 23:55:05.759151","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-18 00:33:26.204626","version":"3.13.3"}

src/.idea/libraries/Dart_Packages.xml

@@ -47,15 +47,7 @@
         <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>
@@ -69,15 +61,7 @@
         <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>
@@ -119,15 +103,7 @@
         <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>
@@ -234,21 +210,9 @@
       <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" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/packages/flutter_test/lib" />
-=======
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/pkg/sky_engine/lib" />
-      <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 />

src/.idea/libraries/Dart_Packages2.xml

@@ -0,0 +1,220 @@
+<component name="libraryTable">
+  <library name="Dart Packages" type="DartPackagesLibraryType">
+    <properties>
+      <option name="packageNameToDirsMap">
+        <entry key="async">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="boolean_selector">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="characters">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="clock">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="collection">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.17.2/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="fake_async">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flutter">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../../flutter/packages/flutter/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flutter_lints">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="flutter_test">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../../flutter/packages/flutter_test/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="lints">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="matcher">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="material_color_utilities">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="meta">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.9.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="path">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="sky_engine">
+          <value>
+            <list>
+              <option value="$PROJECT_DIR$/../../flutter/bin/cache/pkg/sky_engine/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="source_span">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" />
+            </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>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="stream_channel">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="string_scanner">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" />
+            </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>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="test_api">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.0/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="vector_math">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" />
+            </list>
+          </value>
+        </entry>
+        <entry key="web">
+          <value>
+            <list>
+              <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib" />
+            </list>
+          </value>
+        </entry>
+      </option>
+    </properties>
+    <CLASSES>
+      <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" />
+      <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" />
+      <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/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" />
+      <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" />
+      <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" />
+      <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" />
+      <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.1.4-beta/lib" />
+      <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" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

src/.idea/libraries/Dart_SDK.xml

@@ -1,53 +1,6 @@
 <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" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/ffi" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/js_interop" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file://$PROJECT_DIR$/../../flutter/flutter/bin/cache/dart-sdk/lib/web_gl" />
-=======
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/ffi" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/js_interop" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://$PROJECT_DIR$/../../flutter_windows_3.13.3-stable/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <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" />
@@ -69,7 +22,6 @@
       <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 />

src/.idea/libraries/Dart_SDK2.xml

@@ -0,0 +1,29 @@
+<component name="libraryTable">
+  <library name="Dart SDK">
+    <CLASSES>
+      <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" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

src/build/app/intermediates/dex_number_of_buckets_file/debug/out

@@ -1 +1 @@
-8
+6

src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties

@@ -1,24 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Tue Oct 17 19:50:03 CST 2023
-=======
-<<<<<<< HEAD
-#Tue Oct 17 20:13:55 CST 2023
->>>>>>> 14d63d40b382a521b727c9cc2af65f1a79901a2b
-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
-com.example.travelguide.app-main-5\:/drawable-v21/launch_background.xml=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\drawable-v21_launch_background.xml.flat
-com.example.travelguide.app-main-5\:/mipmap-xhdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.png.flat
-com.example.travelguide.app-main-5\:/drawable/launch_background.xml=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\drawable_launch_background.xml.flat
-com.example.travelguide.app-main-5\:/mipmap-hdpi/ic_launcher.png=D\:\\travelguideProject\\src\\build\\app\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.png.flat
-<<<<<<< HEAD
-=======
-=======
-#Tue Oct 17 22:07:14 CST 2023
-=======
-#Tue Oct 17 23:55:25 CST 2023
->>>>>>> ad4150daaf7c154a4113e995eb1f0f1a9c5af57f
+#Wed Oct 18 00:33:36 CST 2023
 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
@@ -26,8 +6,3 @@ 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

src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml

@@ -1,14 +1,2 @@
 <?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
-<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>
-=======
-<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
+<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>

src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,19 +1,4 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-#Tue Oct 17 23:13:31 CST 2023
-base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-=======
-<<<<<<< HEAD
-#Tue Oct 17 23:35:51 CST 2023
-base.0=D\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
-=======
-#Tue Oct 17 22:31:18 CST 2023
+#Wed Oct 18 00:33:42 CST 2023
 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

src/build/app/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

@@ -19,15 +19,7 @@
 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" >
@@ -65,24 +57,7 @@
 54            android:value="2" />
 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
-58            android:required="false" />
-58-->[androidx.window:window:1.0.0-beta04] C:\Users\康江龙\.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\康江龙\.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\康江龙\.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\康江龙\.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] E:\AndroidTool\AndroidGradle\.gradle\caches\transforms-3\25cee5f028ac2a6b79fd6278ff5b59e2\transformed\jetified-window-1.0.0-beta04\AndroidManifest.xml:26:13-54
 58            android:required="false" />
@@ -92,12 +67,7 @@
 60            android:name="androidx.window.sidecar"
 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>

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json

@@ -4,15 +4,7 @@
             "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",

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

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json

@@ -4,15 +4,7 @@
             "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",

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json

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

src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json

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