From 8a77a195fa6ce3aad15857a2213011bf0e8d7bd5 Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Thu, 4 Aug 2011 19:35:04 +0000
Subject: Fix compile error.

---
 Source/SPDatabaseDocument.m | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'Source')

diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 7fb04a32..864061c4 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -3871,10 +3871,7 @@ static NSString *SPCreateSyntx = @"SPCreateSyntax";
  */
 - (void)parentTabDidClose
 {
-<<<<<<< .working
-=======
 #ifndef SP_REFACTOR
->>>>>>> .merge-right.r3375
 	// Cancel autocompletion trigger
 	if([prefs boolForKey:SPCustomQueryAutoComplete])
 #endif
-- 
cgit v1.2.3