Resolve Conflicts

EvilInsultGenerator · Jul 22, 2022 · cc07e66 · cc07e66
2 parents 2a7746d + 91d28a9
commit cc07e66
Show file tree

Hide file tree

Showing 228 changed files with 0 additions and 1,393 deletions.
diff --git a/fastlane/metadata/android/af-ZA/full_description.txt b/fastlane/metadata/android/af-ZA/full_description.txt
diff --git a/fastlane/metadata/android/af-ZA/short_description.txt b/fastlane/metadata/android/af-ZA/short_description.txt
diff --git a/fastlane/metadata/android/af-ZA/title.txt b/fastlane/metadata/android/af-ZA/title.txt
diff --git a/fastlane/metadata/android/af-ZA/video.txt b/fastlane/metadata/android/af-ZA/video.txt
diff --git a/fastlane/metadata/android/ar-SA/short_description.txt b/fastlane/metadata/android/ar-SA/short_description.txt
diff --git a/fastlane/metadata/android/ar-SA/title.txt b/fastlane/metadata/android/ar-SA/title.txt
diff --git a/fastlane/metadata/android/ar-SA/video.txt b/fastlane/metadata/android/ar-SA/video.txt
diff --git a/fastlane/metadata/android/bg-BG/full_description.txt b/fastlane/metadata/android/bg-BG/full_description.txt
diff --git a/fastlane/metadata/android/bg-BG/short_description.txt b/fastlane/metadata/android/bg-BG/short_description.txt
diff --git a/fastlane/metadata/android/bg-BG/short_desription.txt b/fastlane/metadata/android/bg-BG/short_desription.txt
diff --git a/fastlane/metadata/android/bg-BG/title.txt b/fastlane/metadata/android/bg-BG/title.txt
diff --git a/fastlane/metadata/android/bg-BG/video.txt b/fastlane/metadata/android/bg-BG/video.txt
diff --git a/fastlane/metadata/android/bn-BD/video.txt b/fastlane/metadata/android/bn-BD/video.txt
diff --git a/fastlane/metadata/android/ca-ES/full_description.txt b/fastlane/metadata/android/ca-ES/full_description.txt
diff --git a/fastlane/metadata/android/ca-ES/short_description.txt b/fastlane/metadata/android/ca-ES/short_description.txt
diff --git a/fastlane/metadata/android/ca-ES/title.txt b/fastlane/metadata/android/ca-ES/title.txt
diff --git a/fastlane/metadata/android/ca-ES/video.txt b/fastlane/metadata/android/ca-ES/video.txt
diff --git a/fastlane/metadata/android/cs-CZ/changelogs/1.txt b/fastlane/metadata/android/cs-CZ/changelogs/1.txt
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/1.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2.jpg b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/2.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3.jpg b/fastlane/metadata/android/cs-CZ/images/phoneScreenshots/3.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/1.png
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/2.png
diff --git a/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/3.png b/fastlane/metadata/android/cs-CZ/images/sevenInchScreenshots/3.png
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/1.jpg b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/1.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/2.jpg b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/2.jpg
diff --git a/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/3.jpg b/fastlane/metadata/android/cs-CZ/images/tenInchScreenshots/3.jpg
diff --git a/fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt
diff --git a/fastlane/metadata/android/cs-CZ/video.txt b/fastlane/metadata/android/cs-CZ/video.txt
diff --git a/fastlane/metadata/android/da-DK/full_description.txt b/fastlane/metadata/android/da-DK/full_description.txt
diff --git a/fastlane/metadata/android/da-DK/short_description.txt b/fastlane/metadata/android/da-DK/short_description.txt
diff --git a/fastlane/metadata/android/da-DK/title.txt b/fastlane/metadata/android/da-DK/title.txt
diff --git a/fastlane/metadata/android/da-DK/video.txt b/fastlane/metadata/android/da-DK/video.txt
diff --git a/fastlane/metadata/android/de-DE/short_desription.txt b/fastlane/metadata/android/de-DE/short_desription.txt
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
diff --git a/fastlane/metadata/android/de-DE/video.txt b/fastlane/metadata/android/de-DE/video.txt
diff --git a/fastlane/metadata/android/el-GR/full_description.txt b/fastlane/metadata/android/el-GR/full_description.txt
diff --git a/fastlane/metadata/android/el-GR/short_description.txt b/fastlane/metadata/android/el-GR/short_description.txt
diff --git a/fastlane/metadata/android/el-GR/title.txt b/fastlane/metadata/android/el-GR/title.txt
diff --git a/fastlane/metadata/android/el-GR/video.txt b/fastlane/metadata/android/el-GR/video.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/1.txt b/fastlane/metadata/android/en-US/changelogs/1.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/2.txt b/fastlane/metadata/android/en-US/changelogs/2.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/3.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/33.txt b/fastlane/metadata/android/en-US/changelogs/33.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/fastlane/metadata/android/en-US/changelogs/4.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/5.txt b/fastlane/metadata/android/en-US/changelogs/5.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/fastlane/metadata/android/en-US/changelogs/6.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/8.txt b/fastlane/metadata/android/en-US/changelogs/8.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/9.txt b/fastlane/metadata/android/en-US/changelogs/9.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.jpg
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.jpg
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
diff --git a/fastlane/metadata/android/en-US/video.txt b/fastlane/metadata/android/en-US/video.txt
diff --git a/fastlane/metadata/android/es-ES/short_description.txt b/fastlane/metadata/android/es-ES/short_description.txt
diff --git a/fastlane/metadata/android/es-ES/title.txt b/fastlane/metadata/android/es-ES/title.txt
diff --git a/fastlane/metadata/android/es-ES/video.txt b/fastlane/metadata/android/es-ES/video.txt