From b707593e8d68749cd8441dc7ccd5dbe01f78b18d Mon Sep 17 00:00:00 2001
From: q-- <anonymous-contributor@example.com>
Date: Fri, 30 Nov 2012 19:03:35 +0100
Subject: [PATCH] Fixed merge

---
 .gitattributes                         | 30 +++++++++++++-------------
 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 +-
 8 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 87000817f..41aa20c96 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,19 +1,19 @@
 # End-of-line normalization
 * text=auto
 
-*.cmd			text eol=lf
-*.sh			text eol=lf
-*.md			text eol=lf
-*.json			text eol=lf
-*.js			text eol=lf
-*.html			text eol=lf
-*.css			text eol=lf
-*.manifest		text eol=lf
-*.rdf			text eol=lf
-*.xul			text eol=lf
-*.dtd			text eol=lf
-*.properties	text eol=lf
-*.php			text eol=lf
+*.cmd         text eol=lf
+*.sh          text eol=lf
+*.md          text eol=lf
+*.json        text eol=lf
+*.js          text eol=lf
+*.html        text eol=lf
+*.css         text eol=lf
+*.manifest    text eol=lf
+*.rdf         text eol=lf
+*.xul         text eol=lf
+*.dtd         text eol=lf
+*.properties  text eol=lf
+*.php         text eol=lf
 
-*.png			binary
-*.gif			binary
+*.png         binary
+*.gif         binary
diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json
index a999e4514..3747a4c0a 100644
--- 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": {
diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json
index a999e4514..3747a4c0a 100644
--- 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": {
diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json
index a999e4514..3747a4c0a 100644
--- 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": {
diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json
index a999e4514..3747a4c0a 100644
--- 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": {
diff --git a/drivers/html/apps.json b/drivers/html/apps.json
index a999e4514..3747a4c0a 100644
--- 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": {
diff --git a/drivers/php/apps.json b/drivers/php/apps.json
index a999e4514..3747a4c0a 100644
--- 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": {
diff --git a/share/apps.json b/share/apps.json
index c89c29bff..3747a4c0a 100644
--- 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": {