diff --git a/Vernissage.xcodeproj/project.pbxproj b/Vernissage.xcodeproj/project.pbxproj index 0e7b04a..5b1d146 100644 --- a/Vernissage.xcodeproj/project.pbxproj +++ b/Vernissage.xcodeproj/project.pbxproj @@ -1321,11 +1321,7 @@ CODE_SIGN_ENTITLEMENTS = VernissageWidget/VernissageWidgetExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; -<<<<<<< HEAD - CURRENT_PROJECT_VERSION = 207; -======= - CURRENT_PROJECT_VERSION = 144; ->>>>>>> develop + CURRENT_PROJECT_VERSION = 208; DEVELOPMENT_TEAM = B2U9FEKYP8; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = VernissageWidget/Info.plist; @@ -1337,11 +1333,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); -<<<<<<< HEAD MARKETING_VERSION = 1.10.0; -======= - MARKETING_VERSION = 1.9.1; ->>>>>>> develop PRODUCT_BUNDLE_IDENTIFIER = dev.mczachurski.vernissage.widget; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1360,11 +1352,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = VernissageWidget/VernissageWidgetExtension.entitlements; CODE_SIGN_STYLE = Automatic; -<<<<<<< HEAD - CURRENT_PROJECT_VERSION = 207; -======= - CURRENT_PROJECT_VERSION = 144; ->>>>>>> develop + CURRENT_PROJECT_VERSION = 208; DEVELOPMENT_TEAM = B2U9FEKYP8; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = VernissageWidget/Info.plist; @@ -1376,11 +1364,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); -<<<<<<< HEAD MARKETING_VERSION = 1.10.0; -======= - MARKETING_VERSION = 1.9.1; ->>>>>>> develop PRODUCT_BUNDLE_IDENTIFIER = dev.mczachurski.vernissage.widget; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1398,11 +1382,7 @@ CODE_SIGN_ENTITLEMENTS = VernissageShare/VernissageShareExtension.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; -<<<<<<< HEAD - CURRENT_PROJECT_VERSION = 207; -======= - CURRENT_PROJECT_VERSION = 144; ->>>>>>> develop + CURRENT_PROJECT_VERSION = 208; DEVELOPMENT_TEAM = B2U9FEKYP8; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = VernissageShare/Info.plist; @@ -1414,11 +1394,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); -<<<<<<< HEAD MARKETING_VERSION = 1.10.0; -======= - MARKETING_VERSION = 1.9.1; ->>>>>>> develop PRODUCT_BUNDLE_IDENTIFIER = dev.mczachurski.vernissage.share; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1435,11 +1411,7 @@ ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = NO; CODE_SIGN_ENTITLEMENTS = VernissageShare/VernissageShareExtension.entitlements; CODE_SIGN_STYLE = Automatic; -<<<<<<< HEAD - CURRENT_PROJECT_VERSION = 207; -======= - CURRENT_PROJECT_VERSION = 144; ->>>>>>> develop + CURRENT_PROJECT_VERSION = 208; DEVELOPMENT_TEAM = B2U9FEKYP8; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = VernissageShare/Info.plist; @@ -1451,11 +1423,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); -<<<<<<< HEAD MARKETING_VERSION = 1.10.0; -======= - MARKETING_VERSION = 1.9.1; ->>>>>>> develop PRODUCT_BUNDLE_IDENTIFIER = dev.mczachurski.vernissage.share; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1597,11 +1565,7 @@ CODE_SIGN_ENTITLEMENTS = Vernissage/Vernissage.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; -<<<<<<< HEAD - CURRENT_PROJECT_VERSION = 207; -======= - CURRENT_PROJECT_VERSION = 144; ->>>>>>> develop + CURRENT_PROJECT_VERSION = 208; DEVELOPMENT_ASSET_PATHS = "\"Vernissage/Preview Content\""; DEVELOPMENT_TEAM = B2U9FEKYP8; ENABLE_PREVIEWS = YES; @@ -1620,11 +1584,7 @@ "$(inherited)", "@executable_path/Frameworks", ); -<<<<<<< HEAD MARKETING_VERSION = 1.10.0; -======= - MARKETING_VERSION = 1.9.1; ->>>>>>> develop PRODUCT_BUNDLE_IDENTIFIER = dev.mczachurski.vernissage; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -1648,11 +1608,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Vernissage/Vernissage.entitlements; CODE_SIGN_STYLE = Automatic; -<<<<<<< HEAD - CURRENT_PROJECT_VERSION = 207; -======= - CURRENT_PROJECT_VERSION = 144; ->>>>>>> develop + CURRENT_PROJECT_VERSION = 208; DEVELOPMENT_ASSET_PATHS = "\"Vernissage/Preview Content\""; DEVELOPMENT_TEAM = B2U9FEKYP8; ENABLE_PREVIEWS = YES; @@ -1671,11 +1627,7 @@ "$(inherited)", "@executable_path/Frameworks", ); -<<<<<<< HEAD MARKETING_VERSION = 1.10.0; -======= - MARKETING_VERSION = 1.9.1; ->>>>>>> develop PRODUCT_BUNDLE_IDENTIFIER = dev.mczachurski.vernissage; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";