Version 0.21.9.

Edward Smith · Edward Smith · commit dfbaaa7d8acf · 2017-11-20T11:45:25.000-08:00
diff --git a/Branch-SDK/Branch-SDK/BNCConfig.m b/Branch-SDK/Branch-SDK/BNCConfig.m
@@ -12,4 +12,4 @@
 BOOL       const BNC_API_PINNED      = YES;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.21.8";
+NSString * const BNC_SDK_VERSION     = @"0.21.9";
diff --git a/Branch-TestBed/Framework-Info.plist b/Branch-TestBed/Framework-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.21.8</string>
+	<string>0.21.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.21.8</string>
+	<string>0.21.9</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
diff --git a/Branch.podspec b/Branch.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.21.8"
+  s.version          = "0.21.9"
   s.summary          = "Create an HTTP URL for any piece of content in your app"
   s.description      = <<-DESC
 - Want the highest possible conversions on your sharing feature?
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 Branch iOS SDK Change Log
 
+- v0.21.9
+  * _*Master Release*_ - November 20, 2017
+  * Fixed some merge conflicts.
+
 - v0.21.8
   * _*Master Release*_ - November 20, 2017
 
diff --git a/carthage-files/Info.plist b/carthage-files/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.21.8</string>
+	<string>0.21.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.21.8</string>
+	<string>0.21.9</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/scripts/version b/scripts/version
@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.21.8
+version=0.21.9
 
 if (( $# == 0 )); then
     echo $version

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ Options:`
`31`	`31`	`USAGE`
`32`	`32`	`}`
`33`	`33`
`34`		`-version=0.21.8`
	`34`	`+version=0.21.9`
`35`	`35`
`36`	`36`	`if (( $# == 0 )); then`
`37`	`37`	`echo $version`