actually save the damn merge

Mudlet · Mar 24, 2020 · df5b0d2 · df5b0d2
1 parent 5ebc1d7
commit df5b0d2
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/mudlet-lua/lua/GUIUtils.lua b/src/mudlet-lua/lua/GUIUtils.lua
@@ -1863,8 +1863,6 @@ end
 -- createButton is deprecated better use createLabel instead
 createButton = createLabel
 
-<<<<<<< HEAD
-
 -- Internal function used by copy2html and copy2decho
 local function copy2color(name,win,str,inst)
   local line = getCurrentLine(win or "main")
@@ -1949,7 +1947,7 @@ end
 function copy2html(win, str, inst)
   return copy2color("copy2html", win, str, inst)
 end
-=======
+
 function resetLabelCursor(name)
   assert(type(name) == 'string', 'resetLabelCursor: bad argument #1 type (name as string expected, got '..type(name)..'!)')
   return setLabelCursor(name, -1)
@@ -1962,4 +1960,3 @@ function setLabelCursor(labelname, cursorShape)
   end
   return setLabelCursorLayer(labelname, cursorShape)
 end
->>>>>>> upstream/development