Manual merge

11 years ago · a7437e0926
parent 3367347066
commit a7437e0926
1 changed files with 0 additions and 3 deletions
--- 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",