Fixing merge bug.

verypossible · Dec 6, 2021 · c9b1290 · c9b1290
1 parent 6d677a2
commit c9b1290
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -40,11 +40,7 @@ repositories {
 
 dependencies {
     api "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-<<<<<<< HEAD
-    api "com.salesforce.marketingcloud:marketingcloudsdk:${safeExtGet('marketingCloudVersion', '7.4.2')}"
-=======
     api "com.salesforce.marketingcloud:marketingcloudsdk:${safeExtGet('marketingCloudVersion', '7.4.+')}"
->>>>>>> 8368bfa0ac154b2d8a953f1adf9b8cba61ae15fe
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'org.mockito:mockito-core:2.28.2'

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -179,11 +179,7 @@ SPEC CHECKSUMS:
   DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-<<<<<<< HEAD
-  MarketingCloudSDK: cbd23ea0fb5576a71b54137652051e23e1892f2c
-=======
   MarketingCloudSDK: 7273000b7480fa797dcd9e4924d1279095539601
->>>>>>> 5f5355b75a3d5d644b2213f214646cf6aad72e78
   React: 4b3c068e793e96672dcd186a2b572fac43e4b031
   React-Core: 3dc86b22920597f813c62a96db3165950b64826b
   React-cxxreact: 0dacb291e59b81e7c3f22a2118bee853ba8a60d2