Merge branch 'master' of

http://82.156.111.58:3000/maojian/analyst_translate.git
6 months ago · 2024e20e36
2 changed files with 9 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+/target/
+/logs/
+/.idea/
--- a/README.md
+++ b/README.md
@ -1 +1,7 @@
+<<<<<<< HEAD
 bfd翻译应用
+=======
+# analyst_translate
+
+文字翻译
+>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/analyst_translate.git