Fix broken merge

[roojs1] / Roo / DomHelper.js

diff --git a/Roo/DomHelper.js b/Roo/DomHelper.js
index b4826b2..aef1638 100644 (file)
--- a/Roo/DomHelper.js
+++ b/Roo/DomHelper.js
@@ -12,11 +12,7 @@
 
 // nasty IE9 hack - what a pile of crap that is..
 
-<<<<<<< HEAD
- if (typeof Range.prototype.createContextualFragment == "undefined") {
-=======
  if (typeof Range != "undefined" && typeof Range.prototype.createContextualFragment == "undefined") {
->>>>>>> cba88e023db3bc6c12affc2e25a149cdac04fd17
     Range.prototype.createContextualFragment = function (html) {
         var doc = window.document;
         var container = doc.createElement("div");