chore: corrected merge conflict with master

Author: ethanneff

package.json

@@ -2,7 +2,7 @@
   "name": "branch-cordova-sdk",
   "description": "Branch Metrics Cordova SDK",
   "main": "www/branch.js",
-  "version": "2.5.15",
+  "version": "2.5.16",
   "homepage": "https://github.com/BranchMetrics/cordova-ionic-phonegap-branch-deep-linking",
   "repository": {
     "type": "git",

plugin.template.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="2.5.15">
+  version="2.5.16">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 

plugin.xml

@@ -24,7 +24,7 @@ SOFTWARE.
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="branch-cordova-sdk"
-  version="2.5.15">
+  version="2.5.16">
 
   <!-- DO NOT EDIT THIS FILE. MAKE ALL CHANGES TO plugin.template.xml INSTEAD -->
 
@@ -88,14 +88,14 @@ SOFTWARE.
     <header-file src="src/ios/BranchSDK.h" />
     <source-file src="src/ios/BranchSDK.m" />
     <source-file src="src/ios/AppDelegate+BranchSdk.m" />
-    
+
     <header-file src="src/ios/dependencies/Fabric/ANSCompatibility.h" />
     <header-file src="src/ios/dependencies/Fabric/Answers.h" />
     <header-file src="src/ios/dependencies/Fabric/FABAttributes.h" />
     <header-file src="src/ios/dependencies/Fabric/FABKitProtocol.h" />
     <header-file src="src/ios/dependencies/Fabric/Fabric+FABKits.h" />
     <header-file src="src/ios/dependencies/Fabric/Fabric.h" />
-    
+
     <header-file src="src/ios/dependencies/Branch-SDK/BNCCallbacks.h" />
     <header-file src="src/ios/dependencies/Branch-SDK/BNCCommerceEvent.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/BNCCommerceEvent.m" />
@@ -155,7 +155,7 @@ SOFTWARE.
     <source-file src="src/ios/dependencies/Branch-SDK/BranchViewHandler.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/NSMutableDictionary+Branch.m" />
-    
+
     <header-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Requests/BNCServerRequest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchCloseRequest.h" />
@@ -185,6 +185,6 @@ SOFTWARE.
     <header-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.h" />
     <source-file src="src/ios/dependencies/Branch-SDK/Requests/BranchUserCompletedActionRequest.m" />
     <header-file src="src/ios/dependencies/Branch-SDK/Requests/PromoViewHandler.h" />
-    
+
   </platform>
 </plugin>