htmlpreview
diff --git a/‎htmlpreview.js‎
Lines changed: 0 additions & 4 deletions b/‎htmlpreview.js‎
Lines changed: 0 additions & 4 deletions
diff --git a/‎htmlpreview.min.js‎
Lines changed: 1 addition & 5 deletions b/‎htmlpreview.min.js‎
Lines changed: 1 addition & 5 deletions
@@ -68,11 +68,7 @@ var HTMLPreview = {
 		&& data.query.results.resources
 		&& data.query.results.resources.content
 		&& data.query.results.resources.status == 200) {
-<<<<<<< HEAD
 			HTMLPreview.content = data.query.results.resources.content.replace(/<head>/i, '<head><base href="' + HTMLPreview.folder() + '">').replace(/<\/body>/i, '<script src="http://' + location.hostname + '/htmlpreview.min.js"></script><script>HTMLPreview.replaceAssets();</script></body>').replace(/<\/head>\s*<frameset/gi, '<script src="http://' + location.hostname + '/htmlpreview.min.js"></script><script>document.write("<script>HTMLPreview.replaceAssets();</script>");</script></head><frameset'); //Add <base> just after <head> and inject <script> just before </body> or </head> if <frameset>
-=======
-			HTMLPreview.content = data.query.results.resources.content.replace(/<head>/i, '<head><base href="' + HTMLPreview.folder() + '">').replace(/<\/body>/i, '<script src="http://' + location.hostname + '/htmlpreview.min.js"></script><script>HTMLPreview.replaceAssets();</script></body>').replace(/<\/head>\s*<frameset/gi, '<script src="http://' + location.hostname + '/htmlpreview.min.js"></script><script>document.addEventListener("DOMContentLoaded",HTMLPreview.replaceAssets,false);</script></head><frameset'); //Add <base> just after <head> and inject <script> just before </body> or </head> if <frameset>
->>>>>>> fd67c324018b6672e68a1bc247e7771ce47afdc4
 			setTimeout(function() {
 				document.open();
 				document.write(HTMLPreview.content);