From 0e6c680ed4fe9a0ea854e30c715ded78bab649fa Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sun, 7 Oct 2012 12:36:44 +1100
Subject: [PATCH] Fixed merge

---
 drivers/firefox/content/js/content.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/firefox/content/js/content.js b/drivers/firefox/content/js/content.js
index 31f537446..60927bb97 100644
--- a/drivers/firefox/content/js/content.js
+++ b/drivers/firefox/content/js/content.js
@@ -51,18 +51,11 @@
 		sendAsyncMessage('wappalyzer', {
 			action:   'analyze',
 			hostname: content.location.hostname,
-<<<<<<< HEAD
 			url:      content.location.href,
 			analyze:  {
 				html: html,
 				env:  prefs.analyzeJavaScript ? Object.keys(content.wrappedJSObject) : []
 				}
 			});
-=======
-			html:     html,
-			url:      content.location.href,
-			env: 	  Object.keys(content.wrappedJSObject)
-		});
->>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
 	}
 })();