auto-translate, resolve conflict

jackeylee115 · Aug 19, 2024 · 7855325 · 7855325
1 parent 87c3151
commit 7855325
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/scripts/auto-translate/update-content-translation.py b/scripts/auto-translate/update-content-translation.py
@@ -183,11 +183,7 @@ def main():
             copy_from_repo_to_LLM_Translator(lang, input_list_path, destination_base_path)
 
             source_path = f"pbn-from-{lang}-to-en"
-<<<<<<< HEAD
-            # run_LLM_Translator(lang, 'en', source_path)
-=======
             run_LLM_Translator(lang, 'en', source_path)
->>>>>>> 735dad80f79c2d4aee56fc56f88889d59b404e34
             print('llm translator from lang to en running')
             copy_from_LLM_Translator_to_repo(lang, source_path)
 
@@ -203,11 +199,7 @@ def main():
             copy_from_repo_to_LLM_Translator('en', input_list_path, destination_base_path)
 
             source_path = f"pbn-from-en-to-{lang}"
-<<<<<<< HEAD
-            # run_LLM_Translator('en', lang, source_path)
-=======
             run_LLM_Translator('en', lang, source_path)
->>>>>>> 735dad80f79c2d4aee56fc56f88889d59b404e34
             print('llm runs from en to lang')
             copy_from_LLM_Translator_to_repo(lang, source_path)