Fixed merge

12 years ago · b707593e8d
parent 2eea1dd4cc
commit b707593e8d
8 changed files with 16 additions and 40 deletions
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@ -1582,11 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-<<<<<<< HEAD
 			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
-=======
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
->>>>>>> 7cd3684... More strict patterns
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@ -1582,11 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-<<<<<<< HEAD
 			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
-=======
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
->>>>>>> 7cd3684... More strict patterns
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@ -1582,11 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-<<<<<<< HEAD
 			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
-=======
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
->>>>>>> 7cd3684... More strict patterns
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@ -1582,11 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-<<<<<<< HEAD
 			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
-=======
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
->>>>>>> 7cd3684... More strict patterns
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@ -1582,11 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-<<<<<<< HEAD
 			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
-=======
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
->>>>>>> 7cd3684... More strict patterns
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@ -1582,11 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-<<<<<<< HEAD
 			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
-=======
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
->>>>>>> 7cd3684... More strict patterns
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {
--- a/share/apps.json
+++ b/share/apps.json
@ -1582,7 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-			"url": "^(www.)?[^/]+\\.tumblr\\.com",
+			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {