diff options
Diffstat (limited to 'Source')
| -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 |