From 61aed48843bf0ac4de808c25bea5d699d761d26d Mon Sep 17 00:00:00 2001
From: Javi Garate <fjgarate@cimne.upc.edu>
Date: Wed, 9 Feb 2022 17:02:46 +0100
Subject: [PATCH] typo

---
 kratos.gid/scripts/Utils.tcl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kratos.gid/scripts/Utils.tcl b/kratos.gid/scripts/Utils.tcl
index 6f36acb72..55f24f694 100644
--- 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"