Merge pull request livecode#2058 from runrevmark/exts-fix_header_widget

runrevmark · runrevmark · commit a04099c59782 · 2015-03-13T11:19:54.000Z
[[ Extensions ]] Remove extraneous conflict marker from header.lcb.
diff --git a/extensions/widgets/header/header.lcb b/extensions/widgets/header/header.lcb
@@ -425,7 +425,6 @@ public handler setLabel(in pLabel as String) as undefined
 	redraw all
 end handler
 
-<<<<<<< HEAD
 ----------
 -- this handler sets the list of actions
 public handler setActions(in pActions as String) as undefined
