minor

OpenSEMBA · Dec 20, 2024 · bee6ee6 · bee6ee6
1 parent c1dd573
commit bee6ee6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src_main_pub/tag_changes.txt b/src_main_pub/tag_changes.txt
diff --git a/test/pyWrapper/utils.py b/test/pyWrapper/utils.py
@@ -3,13 +3,10 @@
 import json
 import numpy as np
 import matplotlib.pyplot as plt
-<<<<<<< HEAD
 import pyvista as pv
-
-=======
 from os import environ as env
 from sys import platform
->>>>>>> origin/dev
+
 # Use of absolute path to avoid conflicts when changing directory.
 EXE_FOLDER = os.getcwd() + '/build/bin/'
 SEMBA_EXE = os.getcwd() + '/build/bin/semba-fdtd'