diff --git a/CODEOWNERS b/CODEOWNERS index 6a10842..f15a1b0 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ -#ECCN: 5D992.c - #GUSINFO:MC Mobile SDK,MobilePush SDK - General -* @bmote,@stopczewska,@stanner,@sandeep-gupta,@rsuda \ No newline at end of file +* @bmote,@stopczewska,@stanner,@sandeep-gupta,@rsuda +# Comment line immediately above ownership line is reserved for related gus information. Please be careful while editing. +#ECCN:Open Source \ No newline at end of file diff --git a/README.md b/README.md index 04ab5a2..44e5a5a 100755 --- a/README.md +++ b/README.md @@ -327,5 +327,8 @@ the SDK and will be requested by the Marketing Cloud support team. **Kind**: static method of [MCReactModule](#MCReactModule) + +--- + ### 3rd Party Product Language Disclaimers Where possible, we changed noninclusive terms to align with our company value of Equality. We retained noninclusive terms to document a third-party system, but we encourage the developer community to embrace more inclusive language. We can update the term when it’s no longer required for technical accuracy. diff --git a/android/build.gradle b/android/build.gradle index eba2d9d..16a6d96 100755 --- a/android/build.gradle +++ b/android/build.gradle @@ -40,7 +40,11 @@ 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'