From a7437e0926dad23f48797017b806804b26280aaa Mon Sep 17 00:00:00 2001
From: Elbert Alias <elbert@alias.io>
Date: Sat, 5 Apr 2014 10:10:50 +1100
Subject: [PATCH] Manual merge

---
 share/apps.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/share/apps.json b/share/apps.json
index 903d1c39e..4500a4245 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -1060,13 +1060,10 @@
 		"Google AdSense": {
 			"website": "google.com/adsense",
 			"cats": [ 36 ],
-<<<<<<< HEAD
 			"env": [ "^google_ad_", "^__google_ad_", "^Goog_AdSense_" ],
 			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick\\.net", "2mdn\\.net" ]
-=======
 			"env": [ "^google_ad_" ],
 			"script": [ "googlesyndication\\.com/pagead/show_ads\\.js", "ad\\.ca\\.doubleclick.net" ]
->>>>>>> 96d095b... Escaped dots in AlloyUI and Google Adsense regular expressions.
 		},
 		"Google App Engine": {
 			"website": "code.google.com/appengine",