Remove other branch edited file

oap-project · Apr 13, 2023 · 4f49cbb · 4f49cbb
1 parent 5207d4c
commit 4f49cbb
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 83 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ target/
 shims-sources/
 env.sh
 *.swp
+*.swo
diff --git a/python/oap-mllib/__init__.py b/python/oap-mllib/__init__.py
diff --git a/python/setup.py b/python/setup.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,3 +9,4 @@ target/ @@
     shims-sources/
     env.sh
     *.swp
+    *.swo