typo

KratosMultiphysics · Feb 9, 2022 · 61aed48 · 61aed48
1 parent 207d242
commit 61aed48
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/kratos.gid/scripts/Utils.tcl b/kratos.gid/scripts/Utils.tcl
@@ -199,10 +199,7 @@ proc Kratos::LoadEnvironment { } {
         # W $data
         # Close the file
         close $fp
-<<<<<<< HEAD
-=======
-
->>>>>>> master
+
         # Preferences are written in json format
         foreach {k v} [write::json2dict $data] {
             # W "$k $v"