From 66cce6c55d693c5becf1623bf939787abdeff37f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 22 Mar 2007 18:12:46 +0000
Subject: [PATCH] Removed conflict markers in scrapers.sql

---
 scrapers.sql | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scrapers.sql b/scrapers.sql
index 84b255acd..ea8d18af5 100644
--- a/scrapers.sql
+++ b/scrapers.sql
@@ -6891,11 +6891,7 @@ REPLACE INTO translators VALUES ('66928fe3-1e93-45a7-8e11-9df6de0a11b3', '1.0.0b
 	Zotero.wait();
 }');
 
-<<<<<<< .mine
 REPLACE INTO translators VALUES ('c73a4a8c-3ef1-4ec8-8229-7531ee384cc4', '1.0.0b3.r1', '', '2007-03-22 18:15:00', 1, 100, 12, 'Open WorldCat (Web)', 'Sean Takats', '^http://(?:www\.)?worldcat\.org/search\?',
-=======
-REPLACE INTO translators VALUES ('c73a4a8c-3ef1-4ec8-8229-7531ee384cc4', '1.0.0b3.r1', '', '2007-03-22 18:00:00', 1, 100, 12, 'Open WorldCat (Web)', 'Sean Takats', '^http://(?:www\.)?worldcat\.org/search\?',
->>>>>>> .r1281
 'function detectWeb(doc, url){
 	var nsResolver = doc.createNSResolver(doc.documentElement);