diff options
author | Max <post@wickenrode.com> | 2018-01-20 03:09:01 +0100 |
---|---|---|
committer | Max <post@wickenrode.com> | 2018-01-20 03:09:01 +0100 |
commit | d403528b2e2be083fe80f5a915d1f6867ec9074e (patch) | |
tree | cd4daf91b4dc49c46a07d9223576995c48aaeadd /Source/SPContentFilterManager.m | |
parent | ef21bc5c3749756c21804d1592f3a3fe2faf7cab (diff) | |
parent | b04243d4d7befb33383d434fe05ea3d7915ef27d (diff) | |
download | sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.tar.gz sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.tar.bz2 sequelpro-d403528b2e2be083fe80f5a915d1f6867ec9074e.zip |
Merge remote-tracking branch 'origin/mergeclasses'
Conflicts:
Source/SPQueryControllerInitializer.m
Source/SPQueryDocumentsController.m
Source/SPQueryFavoriteManager.m
Diffstat (limited to 'Source/SPContentFilterManager.m')
-rw-r--r-- | Source/SPContentFilterManager.m | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m index 9c340745..d0906c27 100644 --- a/Source/SPContentFilterManager.m +++ b/Source/SPContentFilterManager.m @@ -32,13 +32,11 @@ #import "ImageAndTextCell.h" #import "RegexKitLite.h" #import "SPQueryController.h" -#import "SPQueryDocumentsController.h" #import "SPDatabaseDocument.h" #import "SPTableContent.h" #import "SPConnectionController.h" #import "SPSplitView.h" #import "SPAppController.h" -#import "SPAppleScriptSupport.h" static NSString *SPExportFilterAction = @"SPExportFilter"; |