fucckit

ss220club · Apr 12, 2024 · e56bbcd · e56bbcd
1 parent ff8fcdc
commit e56bbcd
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 172 deletions.
diff --git a/.github/workflows/auto_translate.yml b/.github/workflows/auto_translate.yml
diff --git a/.github/workflows/translate_branch_update.yml b/.github/workflows/translate_branch_update.yml
@@ -23,6 +23,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Run script
-        run: ./tools/translate/update_translation.sh
+      - name: Merge with their incoming
+        run: |
+        git merge origin/master --strategy-option theirs
+
 
diff --git a/tools/translate/add_new_translation.sh b/tools/translate/add_new_translation.sh
diff --git a/tools/translate/converter.py b/tools/translate/converter.py
diff --git a/tools/translate/requirements.txt b/tools/translate/requirements.txt
diff --git a/tools/translate/ss220_replacer_linux b/tools/translate/ss220_replacer_linux
diff --git a/tools/translate/ss220_replacer_windows.exe b/tools/translate/ss220_replacer_windows.exe
diff --git a/tools/translate/ss220replace.json b/tools/translate/ss220replace.json
diff --git a/tools/translate/update_translation.sh b/tools/translate/update_translation.sh