conflicts

AppGalleryConnect · Jun 7, 2022 · 551d374 · 551d374
1 parent 59655c4
commit 551d374
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 28 deletions.
diff --git a/applinking/README.md b/applinking/README.md
@@ -1,10 +1,6 @@
 ## AppLinking quickstart
 
-<<<<<<< HEAD
 English | [中文](https://github.com/AppGalleryConnect/agc-demos/blob/main/Android/applinking/README_ZH.md)
-=======
-English | [中文]()
->>>>>>> dfa4723fa944e69ada9f5f1677ee9ed3a9ba5607
 
 ## Table of Contents
 

diff --git a/appmessaging/build.gradle b/appmessaging/build.gradle
@@ -1,20 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 ext {
-<<<<<<< HEAD
-    appmessagingVersion = "1.5.2.300"
-}
-
-buildscript {
-    ext.agcpVersion = '1.5.2.300'
-=======
     appmessagingVersion = "1.6.1.300"
 }
 
 buildscript {
     ext.agcpVersion = '1.6.1.300'
     ext.kotlin_version = "1.5.10"
->>>>>>> dfa4723fa944e69ada9f5f1677ee9ed3a9ba5607
+
     repositories {
         maven { url file('repo').toURI() }
         maven { url 'https://developer.huawei.com/repo' }

diff --git a/authservice/build.gradle b/authservice/build.gradle
@@ -1,20 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 ext {
-<<<<<<< HEAD
-    authVersion = '1.5.2.300'
-}
-
-buildscript {
-    ext.agcpVersion = '1.5.2.300'
-=======
     authVersion = '1.6.1.300'
 }
 
 buildscript {
     ext.agcpVersion = '1.6.1.300'
     ext.kotlin_version = "1.5.10"
->>>>>>> dfa4723fa944e69ada9f5f1677ee9ed3a9ba5607
 
     repositories {
         maven { url file('repo').toURI() }

diff --git a/crash/build.gradle b/crash/build.gradle
@@ -1,20 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 ext {
-<<<<<<< HEAD
-    crashVersion = "1.5.2.300"
-}
-
-buildscript {
-    ext.agcpVersion = '1.5.2.300'
-=======
     crashVersion = "1.6.1.300"
 }
 
 buildscript {
     ext.agcpVersion = '1.6.1.300'
     ext.kotlin_version = "1.5.10"
->>>>>>> dfa4723fa944e69ada9f5f1677ee9ed3a9ba5607
+
     repositories {
         google()
         jcenter()