diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-08-04 19:35:04 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-08-04 19:35:04 +0000 |
| commit | 8a77a195fa6ce3aad15857a2213011bf0e8d7bd5 (patch) | |
| tree | cead563b4ac2d714078dace81816db158bd8f1f5 /Source/SPDatabaseDocument.m | |
| parent | b26a4c45cbafedefe0247971c1ae9961abfe24c3 (diff) | |
| download | sequelpro-8a77a195fa6ce3aad15857a2213011bf0e8d7bd5.tar.gz sequelpro-8a77a195fa6ce3aad15857a2213011bf0e8d7bd5.tar.bz2 sequelpro-8a77a195fa6ce3aad15857a2213011bf0e8d7bd5.zip | |
Fix compile error.
Diffstat (limited to 'Source/SPDatabaseDocument.m')
| -rw-r--r-- | Source/SPDatabaseDocument.m | 3 |
1 files changed, 0 insertions, 3 deletions
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 |