# Conflicts: # android/app/src/main/res/drawable-v21/background.png # ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png |
||
---|---|---|
.. | ||
Flutter | ||
Runner | ||
Runner.xcodeproj | ||
Runner.xcworkspace | ||
RunnerTests | ||
.gitignore | ||
Podfile | ||
Podfile.lock |
# Conflicts: # android/app/src/main/res/drawable-v21/background.png # ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png |
||
---|---|---|
.. | ||
Flutter | ||
Runner | ||
Runner.xcodeproj | ||
Runner.xcworkspace | ||
RunnerTests | ||
.gitignore | ||
Podfile | ||
Podfile.lock |