From 5bc8b729493d3d405fe8325de85ae4d73fbb1b47 Mon Sep 17 00:00:00 2001
From: q-- <anonymous-contributor@example.com>
Date: Fri, 30 Nov 2012 16:00:22 +0100
Subject: [PATCH] Fixed merge

---
 drivers/bookmarklet/json               | 4 ++++
 drivers/chrome/apps.json               | 4 ++++
 drivers/firefox-jetpack/data/apps.json | 4 ++++
 drivers/firefox/content/apps.json      | 4 ++++
 drivers/html/apps.json                 | 4 ++++
 drivers/php/apps.json                  | 4 ++++
 share/apps.json                        | 2 +-
 7 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index 3747a4c0a..a999e4514 100644
--- a/drivers/bookmarklet/json
+++ b/drivers/bookmarklet/json
@@ -1582,7 +1582,11 @@
 		"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": {
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index 3747a4c0a..a999e4514 100644
--- a/drivers/chrome/apps.json
+++ b/drivers/chrome/apps.json
@@ -1582,7 +1582,11 @@
 		"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": {
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index 3747a4c0a..a999e4514 100644
--- a/drivers/firefox-jetpack/data/apps.json
+++ b/drivers/firefox-jetpack/data/apps.json
@@ -1582,7 +1582,11 @@
 		"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": {
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index 3747a4c0a..a999e4514 100644
--- a/drivers/firefox/content/apps.json
+++ b/drivers/firefox/content/apps.json
@@ -1582,7 +1582,11 @@
 		"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": {
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index 3747a4c0a..a999e4514 100644
--- a/drivers/html/apps.json
+++ b/drivers/html/apps.json
@@ -1582,7 +1582,11 @@
 		"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": {
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index 3747a4c0a..a999e4514 100644
--- a/drivers/php/apps.json
+++ b/drivers/php/apps.json
@@ -1582,7 +1582,11 @@
 		"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": {
diff --git a/share/apps.json b/share/apps.json
index 3747a4c0a..c89c29bff 100644
--- a/share/apps.json
+++ b/share/apps.json
@@ -1582,7 +1582,7 @@
 		"Tumblr": {
 			"cats": [ 11 ],
 			"html": "<iframe src=\\\"[^>]+tumblr\\.com",
-			"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
+			"url": "^(www.)?[^/]+\\.tumblr\\.com",
 			"headers": { "X-Tumblr-Usec": ".*" }
 		},
 		"Twilight CMS": {