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

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

Browse Source 
# Conflicts:
#	src/.dart_tool/package_config.json
#	src/.flutter-plugins-dependencies
HanJiaHui_Branch
嘉辉 JIA HUI 2 years ago
parent 6c45713c00 f53c837e0b
commit 94235702ee
24 changed files with 43 additions and 291 deletions
Show Stats Download Patch File Download Diff File

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

File diff suppressed because one or more lines are too long

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

Binary file not shown.

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

@ -166,11 +166,15 @@
"languageVersion": "3.1"
}
],
<<<<<<< HEAD
<<<<<<< HEAD
"generated": "2023-10-18T00:09:25.397919Z",
=======
"generated": "2023-10-17T16:33:26.011261Z",
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
=======
"generated": "2023-10-18T00:10:28.185657Z",
>>>>>>> f53c837e0b781167ecb3acbfd215539afb64f42e
"generator": "pub",
"generatorVersion": "3.1.1"
}

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

@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"android":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"macos":[{"name":"sqflite","path":"C:\\\\Users\\\\86131\\\\AppData\\\\Local\\\\Pub\\\\Cache\\\\hosted\\\\pub.dev\\\\sqflite-2.3.0\\\\","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"sqflite","dependencies":[]}],"date_created":"2023-10-18 08:09:25.525794","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"}
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
=======
{"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 08:10:28.388141","version":"3.13.3"}
>>>>>>> f53c837e0b781167ecb3acbfd215539afb64f42e

220
src/.idea/libraries/Dart_Packages2.xml
Unescape View File

@ -1,220 +0,0 @@
<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>

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

@ -1,27 +1,27 @@
<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" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/async" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/cli" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/collection" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/convert" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/core" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/developer" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/ffi" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/html" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/indexed_db" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/io" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/isolate" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js_interop" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js_interop_unsafe" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/js_util" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/math" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/mirrors" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/svg" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/typed_data" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/web_audio" />
<root url="file://$PROJECT_DIR$/../../dartsdk-windows-x64-release/dart-sdk/lib/web_gl" />
</CLASSES>
<JAVADOC />
<SOURCES />

29
src/.idea/libraries/Dart_SDK2.xml
Unescape View File

@ -1,29 +0,0 @@
<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>

7
src/.idea/libraries/Flutter_Plugins.xml
Unescape View File

@ -1,7 +0,0 @@
<component name="libraryTable">
<library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES />
<JAVADOC />
<SOURCES />
</library>
</component>

BIN
src/build/app/intermediates/assets/debug/flutter_assets/kernel_blob.bin
View File

Binary file not shown.

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

Binary file not shown.

BIN
src/build/app/intermediates/flutter/debug/flutter_assets/kernel_blob.bin
View File

Binary file not shown.

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

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
#Wed Oct 18 00:33:42 CST 2023
#Wed Oct 18 07:57:09 CST 2023
base.0=E\:\\travelguideProject\\src\\build\\app\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex
path.0=classes.dex

BIN
src/build/app/outputs/apk/debug/app-debug.apk
View File

Binary file not shown.

BIN
src/build/app/outputs/flutter-apk/app-debug.apk
View File

Binary file not shown.

2
src/build/app/outputs/flutter-apk/app-debug.apk.sha1
Unescape View File

@ -1 +1 @@
bcb6399d2fb9fc70d7f6ea1ed3e58a5b29ba2e61
64b7d3b758b0c62b0e3d5236a80b869a120bd0a1

1
src/lib/travelguideapp/ui/pages/ManagePage.dart
Unescape View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'CollectionEditPage.dart';
import 'ServiceEditPage.dart';
class ManagePage extends StatelessWidget {
@override
Widget build(BuildContext context) {

2
src/lib/travelguideapp/ui/pages/MuseumInfoPage.dart
Unescape View File

@ -124,4 +124,4 @@ class _MuseumInfoPageState extends State<MuseumInfoPage> {
),
);
}
}
}

8
src/pubspec.yaml
Unescape View File

@ -5,7 +5,7 @@ description: A new Flutter project.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# The following defines the version and build number for your application.
version: 1.0.0+1
version: 1.0.0
environment:
sdk: '>=3.1.1 <4.0.0'
@ -17,12 +17,12 @@ dependencies:
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
<<<<<<< HEAD
=======
# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
>>>>>>> b6bc7b9a09496a6df3c4a57c12fac2d2198e02d4
dev_dependencies:
flutter_test:

1
src/travelguide.iml
Unescape View File

@ -10,6 +10,5 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Flutter Plugins" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
</component>
</module>
Write Preview
Loading…
Cancel
Save