Resolving merge conflict

.travis.yml

@@ -13,7 +13,7 @@ before_install:
 script:
  -  xcodebuild test -list -project 'PassiveDataKit.xcodeproj'
  - set -o pipefail && travis_retry xcodebuild test -scheme 'PassiveDataKit' -project 'PassiveDataKit.xcodeproj' -destination 'platform=iOS Simulator,name=iPhone 6s,OS=10.2'
- - xcodebuild -project 'PassiveDataKit.xcodeproj' | tee xcodebuild.log
+ - xcodebuild -project 'PassiveDataKit.xcodeproj' -scheme 'PassiveDataKit' | tee xcodebuild.log
  - oclint-xcodebuild
  - oclint-json-compilation-database
   -e Mixpanel
@@ -22,4 +22,5 @@ script:
   -disable-rule=PreferEarlyExit
   -disable-rule=LongMethod
   -disable-rule=LongVariableName
-
+  -disable-rule=HighCyclomaticComplexity 
+  -disable-rule=HighNPathComplexity

PassiveDataKit.xcodeproj/xcshareddata/xcschemes/PassiveDataKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

PassiveDataKit.xcodeproj/xcshareddata/xcschemes/PassiveDataKitTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0800"
+   LastUpgradeVersion = "0830"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

PassiveDataKit/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

PassiveDataKit/PDKBaseGenerator.h

@@ -0,0 +1,15 @@
+//
+//  PDKBaseGenerator.h
+//  PassiveDataKit
+//
+//  Created by Chris Karr on 6/18/17.
+//  Copyright © 2017 Audacious Software. All rights reserved.
+//
+
+@import Foundation;
+
+#import "PassiveDataKit.h"
+
+@interface PDKBaseGenerator : NSObject<PDKGenerator>
+
+@end

PassiveDataKit/PDKBaseGenerator.m

@@ -0,0 +1,32 @@
+//
+//  PDKBaseGenerator.m
+//  PassiveDataKit
+//
+//  Created by Chris Karr on 6/18/17.
+//  Copyright © 2017 Audacious Software. All rights reserved.
+//
+
+#import "PDKBaseGenerator.h"
+
+#define GENERATOR_ID @"pdk-base-generator"
+
+@implementation PDKBaseGenerator
+
+- (NSString *) fullGeneratorName {
+    return [NSString stringWithFormat:@"%@: %@", [self generatorId], [[PassiveDataKit sharedInstance] userAgent]];
+}
+
+- (NSString *) generatorId {
+    return GENERATOR_ID;
+}
+
+- (void) updateOptions:(NSDictionary *) options {
+
+}
+
+- (UIView *) visualizationForSize:(CGSize) size {
+    return nil;
+}
+
+
+@end