Merge branch 'develop' of https://bdgit.educoder.net/pjamoh6iq/travelguideProject into HanJiaHui_Branch

# Conflicts:
#	src/.dart_tool/package_config.json
#	src/.dart_tool/package_config_subset
#	src/.idea/libraries/Dart_Packages.xml
#	src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
#	src/build/app/intermediates/compressed_assets/debug/out/assets/flutter_assets/kernel_blob.bin.jar
#	src/build/app/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
#	src/build/app/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/build/app/intermediates/flutter/debug/.last_build_id
#	src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
#	src/build/app/intermediates/flutter/debug/flutter_build.d
#	src/build/app/intermediates/flutter/debug/libs.jar
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/merge-state
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1+k56PqPL+yZXyNpf3MLyGoZHag=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1D9rtkv9IQI6ikzv2ZwzBWjgHZw=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1F+n0k6DZ4JptcAx1XScP658CrI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/1ohE4sB6Dwzmw+57nNm9pqj55yY=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/2bPhHDnzNiYX6+yueNvUqLLHhDs=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/3YngtZOBDU2aW7cip9L5d1yjfE4=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/4kGSiE8wN2FLMYQ9kSnKhFWg1wc=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/89SeLvgB6zv9PXd3EyHdTCMHmnk=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/8QdTi_LNuCx9_miuFMuUQS329Ho=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/9w1U0pl6y3jlslqw_9B_egasalc=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/AIfz3zFhI7yOGCx99jlnHs4p_mM=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/APV1oVU1Qmx1+xO8WcEca1bDHpo=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/CAxdPN5yiaKPyg5GIcfmKe8L+t0=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/CChI0RWJH+ylPAqraRFPgelFOio=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/D0C9q24tTpdn6_LemsSVnHQIMjA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/DX7l3gS4NM0E0tllBYF3jl4m2Zg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/DxB9P8mtSofbXyw2R2Kli4KNw90=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/E7SW9VPf_UML56jM3_Yw5iRqut0=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ELHEQHzDUNzifubLkvJVbY+XpWQ=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Et2FTjxJ6dTekT5lyvqwv8Q20m4=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Exg1UFVABa79N7a65s3beK9K_9U=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/FDXmCNvjU1WbLv21hw6fC123ypk=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/GQeVIHgjq7uqIpYoDgS2mVde0DE=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/HZRwHvaPAFpGaPJxFo3JrGxVhJc=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/KAdoV_imWRf4DYnNlzHlhaATidg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LpgFH5P7F5hsrB4KWxd2zp5IilA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/LrIdAwKNNY4BNk0S7WA4tnV7UdM=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/M33rpO38ZKjOf94fjZ39L6j0PJY=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/N2s8SJdmcmTMtWBC7ICjHQzll6w=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/PvI8PYLx1G2x2qXI4LmD11oAQQo=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/QSLxHw3GR2KbP+1h89xMoQZxlEI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RMFlAPuaHMqkY576r3UvrgxG7BI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/RmUk3OTIDHiloSG6QlA9lb0GYUI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/S7jYkm16TkIDy_Gih8t5Zwy4w44=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/SCFOED25zPXd4Cxz9iNUv+AStFo=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/SR5HfyPeEGzlZ4VFtq8QDY2Kvbk=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/So4fzxS+KKwQj2oxV25qMmY1tiw=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/TZEcozvYarb4JDmXWSbtY3Xa4Hs=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/TlYQRfpGKpYo7D9iUiip183fvso=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/UysC6fQK04HVgXOy8Qaks1TDSU8=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/V9b_Om1ptfpJr9xJyP5GfCAzLWo=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/VBiHSEx25Ju+wiTjTFPIJBiSPGM=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/W4tUCGs9L71mdJWwIFxAHLV98sI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/WWHR_bY05hvAM3AWYtbMqZqD1rc=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Wo4lBQTB4E1CY0968BjZM2QrGFg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/WpeCYepx0srjYh7zP3lA_Wi9n6A=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/XJxTyhc62GgI8H8jWC9SVYWr5ow=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/XRmo3o36gdt6Yg8OyFEzd9FNI2g=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xg_lu9CKdw2qNCIe0dJmHLQIbU4=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/Xjp62i4a9IKlLbBTwvHqPPYn9Sc=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/YBrIePEIlymfMjeFXAjfrtzmmLY=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/YHfgfFCa40YR_FspvKorZEJdOC4=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZM0wDz9U6fiFq5PQmoWeR_ZkXQ0=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZpkDOS0d8oOWzs7vtcfgeWMPgco=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ZrYx1_jzW4M35fzuSQgwfGWVcMM=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/_e5POg7bMrqboLyNL48fwouKdkA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/_qU4UKgdcfCGwFG56zxUfwDOgjA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/afEwPEGZzgB3nGDoGf6C63mUrBA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/avioooMiU2PCP6ZlsOcws+LDKds=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/awbZFJsHE+7EME9bKTXZBtcl53A=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/b5Xf486Qj63IdAxOpLAbr38B_Rg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/bswIdob_5t3zwZSYY3ooXliJbFA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/dNDmEFdDQPlZtURgxAO44x6t2r0=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/dgpo4ieOOV474ZW9eYqx06JyEJo=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eB1bVS6pJ24YZ11_zUHiNwfDedU=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eLHxGftB4vMbnplZ4rZbZcae2oA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/eS_Pdl0fKRw6JpraA2OV7Qp+WaI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/fyGrtsW8xZ3HYAEedmBf4LpKSQI=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/gSFTNgTSbdyadgKV8CM8tpqisS8=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/gbmLKhBWBvG84LJJ+8DtmGi70qw=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/gujCbz+JNLrcVqDfqicjclmTnis=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/hmGUEPJJNTNLNsEGdUMNuqXXQLU=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/i9JaTA4As7rNOuXoFojkcz+W2D4=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/iUVGBbdfjhQopRgfdnT5A2QTnl0=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/jndTM_yFVgRgFzUGPtGG5zCgBso=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/kufSkXZjb4yyzvecM9NqSb6U78k=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/kzjlal+1RU2jS4EydfE4pEAzsQM=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/leSPJxn1OjIaBM2F5AJySsu_jSc=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/m0VXB6ZPwOrS9XARhKpdjWCD8cU=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/m3RrDYHI5VqydIb+DJDMXMEZR1E=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/m89fVKLa5jy_WttQLn8k7RCfbTg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/mBQoV_JZWp5WUM4Sq9NBQm+VwHA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/nQf5R_+ymVAGsNufxvsGdUhIR7A=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/oJB7Es_MKuRBb7QYH5H4l+qmgic=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/ozCMBMB1okeaYbxhITcz9vY05vY=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/p6VHVMjjXaFBGMpNrYzNtFEJUzg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/pGHosVfqx3XEhfCIiNWxDjmJsuk=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/qM2edB8etWN2FHgcQxW5k5ifOrA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/qukBQUa63iW9ux76_pB1ltq9H8Y=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/raIMpdhAOuEsj9RfL8rv5irthws=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/sSXd6xGATcIfwbwEOUsEUK6IiFg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wJBkdPd7MB8UlpyGU_piIOIIyEA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wXP+AAh5exPs4fwXVhFzmqpQQaU=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/wmZ_7QnFAcRDSHhfceZdEDlL8SA=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/xfYT860cjKi_XOPpiKxDpm5IMzg=
#	src/build/app/intermediates/incremental/debug-mergeJavaRes/zip-cache/zAXtx6HcKosMvikBJB+60jWYvK0=
#	src/build/app/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/build/app/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/build/app/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/build/app/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/build/app/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-af.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-am.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ar.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-as.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-az.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-b+sr+Latn.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-be.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bg.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bn.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-bs.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ca.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-cs.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-da.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-de.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-el.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rAU.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rCA.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rGB.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rIN.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-en-rXC.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es-rUS.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-es.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-et.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-eu.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fa.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fi.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr-rCA.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-fr.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gl.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-gu.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hi.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hr.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hu.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-hy.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-in.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-is.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-it.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-iw.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ja.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ka.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kk.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-km.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-kn.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ko.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ky.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lo.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lt.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-lv.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mk.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ml.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mn.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-mr.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ms.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-my.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nb.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ne.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-nl.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-or.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pa.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pl.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rBR.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt-rPT.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-pt.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ro.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ru.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-si.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sk.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sl.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sq.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sr.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sv.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-sw.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ta.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-te.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-th.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tl.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-tr.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uk.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-ur.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-uz.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v16.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-v21.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-vi.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rHK.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zu.json
#	src/build/app/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/build/app/intermediates/source_set_path_map/debug/file-map.txt
#	src/build/app/kotlin/compileDebugKotlin/cacheable/last-build.bin
#	src/build/app/kotlin/compileDebugKotlin/local-state/build-history.bin
#	src/build/app/outputs/apk/debug/app-debug.apk
#	src/build/app/outputs/flutter-apk/app-debug.apk
#	src/build/app/outputs/flutter-apk/app-debug.apk.sha1
#	src/build/app/outputs/logs/manifest-merger-debug-report.txt
#	src/build/app/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	src/build/fa1f46848d15fd18dc4e2938a3aa6cef.cache.dill.track.dill
HanJiaHui_Branch
嘉辉 JIA HUI 2 years ago
commit bfd6c80d73

File diff suppressed because one or more lines are too long

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

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

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1 @@
["D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\vm_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\isolate_snapshot_data","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\kernel_blob.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Collection_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\assets/Museum_Preview.jpg","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\packages/cupertino_icons/assets/CupertinoIcons.ttf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\fonts/MaterialIcons-Regular.otf","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\shaders/ink_sparkle.frag","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\AssetManifest.bin","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\FontManifest.json","D:\\travelguideProject\\src\\build\\app\\intermediates\\flutter\\debug\\flutter_assets\\NOTICES.Z"]

File diff suppressed because one or more lines are too long

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

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1,52 @@
//
// Generated file. Do not edit.
// This file is generated from template in file `flutter_tools/lib/src/flutter_plugins.dart`.
//
// @dart = 3.1
import 'dart:io'; // flutter_ignore: dart_io_import.
import 'package:sqflite/sqflite.dart';
import 'package:sqflite/sqflite.dart';
import 'package:sqflite/sqflite.dart';
@pragma('vm:entry-point')
class _PluginRegistrant {
@pragma('vm:entry-point')
static void register() {
if (Platform.isAndroid) {
try {
SqflitePlugin.registerWith();
} catch (err) {
print(
'`sqflite` threw an error: $err. '
'The app may not function as expected until you remove this plugin from pubspec.yaml'
);
}
} else if (Platform.isIOS) {
try {
SqflitePlugin.registerWith();
} catch (err) {
print(
'`sqflite` threw an error: $err. '
'The app may not function as expected until you remove this plugin from pubspec.yaml'
);
}
} else if (Platform.isLinux) {
} else if (Platform.isMacOS) {
try {
SqflitePlugin.registerWith();
} catch (err) {
print(
'`sqflite` threw an error: $err. '
'The app may not function as expected until you remove this plugin from pubspec.yaml'
);
}
} else if (Platform.isWindows) {
}
}
}

@ -103,6 +103,18 @@
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "sqflite",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite-2.3.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "sqflite_common",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/sqflite_common-2.5.0",
"packageUri": "lib/",
"languageVersion": "3.0"
},
{
"name": "stack_trace",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.0",
@ -121,6 +133,12 @@
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "synchronized",
"rootUri": "file:///C:/Users/17651/AppData/Local/Pub/Cache/hosted/pub.dev/synchronized-3.1.0",
"packageUri": "lib/",
"languageVersion": "2.18"
},
{
"name": "term_glyph",
"rootUri": "file:///C:/Users/86131/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1",
@ -152,7 +170,11 @@
"languageVersion": "3.1"
}
],
<<<<<<< HEAD
"generated": "2023-10-16T02:20:45.150497Z",
=======
"generated": "2023-10-16T02:07:01.224187Z",
>>>>>>> 067d60f6f80e4a73df5ed3a91bac3407273085cc
"generator": "pub",
"generatorVersion": "3.1.1"
}

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

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

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

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="FrameworkDetectionExcludesConfiguration">
<type id="android" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="Android API 33, extension level 5 Platform" project-jdk-type="Android SDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_16" project-jdk-name="Android API 33 Platform" project-jdk-type="Android SDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
<component name="SuppressABINotification">

@ -1,6 +0,0 @@
package com.example.travelguide
import io.flutter.embedding.android.FlutterActivity
class MainActivity: FlutterActivity() {
}

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

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

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save