Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SPO-8498 migration to a new structure. #359

Merged
merged 5 commits into from
Oct 5, 2021

Conversation

KristinaZoteva
Copy link
Contributor

@KristinaZoteva KristinaZoteva commented Oct 5, 2021

@KristinaZoteva KristinaZoteva self-assigned this Oct 5, 2021
# Conflicts:
#	examples/cat_facts/README.md
#	examples/cat_facts/analysis_options.yaml
#	examples/cat_facts/android/app/src/main/AndroidManifest.xml
#	examples/cat_facts/android/app/src/main/res/drawable-v21/launch_background.xml
#	examples/cat_facts/android/app/src/main/res/drawable/launch_background.xml
#	examples/cat_facts/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
#	examples/cat_facts/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
#	examples/cat_facts/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	examples/cat_facts/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	examples/cat_facts/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
#	examples/cat_facts/ios/Runner.xcodeproj/project.pbxproj
#	examples/cat_facts/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
#	examples/cat_facts/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
#	examples/cat_facts/ios/Runner/Base.lproj/LaunchScreen.storyboard
#	examples/cat_facts/ios/Runner/Base.lproj/Main.storyboard
#	examples/cat_facts/ios/Runner/Info.plist
#	examples/cat_facts/lib/ui/app/app.dart
#	examples/cat_facts/lib/ui/screen/facts/components/fact_list_tile.dart
#	examples/cat_facts/lib/ui/screen/facts/components/theme_button.dart
#	examples/cat_facts/lib/ui/screen/facts/facts_screen.dart
#	examples/cat_facts/pubspec.yaml
#	tools/ide/vs_code/extensions/mwwm_generator/package-lock.json
#	tools/ide/vs_code/extensions/mwwm_generator/package.json
@MbIXjkee MbIXjkee merged commit 1a6b9a5 into main Oct 5, 2021
@MbIXjkee MbIXjkee deleted the SPO-8498_migration_to_a_new_structure branch October 5, 2021 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants