Skip to content

Commit 52874d8

Browse files
committed
merge conflict error fixed
1 parent adef0d9 commit 52874d8

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

config.json

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4943,7 +4943,7 @@
49434943
"groupId": "org.jetbrains.kotlinx",
49444944
"artifactId": "kotlinx-serialization-core",
49454945
"version": "1.7.3",
4946-
"nugetVersion": "1.7.3.2",
4946+
"nugetVersion": "1.7.3.3",
49474947
"nugetId": "Xamarin.KotlinX.Serialization.Core",
49484948
"type": "androidlibrary",
49494949
"mavenRepositoryType": "MavenCentral"
@@ -4952,16 +4952,34 @@
49524952
"groupId": "org.jetbrains.kotlinx",
49534953
"artifactId": "kotlinx-serialization-core-jvm",
49544954
"version": "1.7.3",
4955-
"nugetVersion": "1.7.3.2",
4955+
"nugetVersion": "1.7.3.3",
49564956
"nugetId": "Xamarin.KotlinX.Serialization.Core.Jvm",
49574957
"type": "androidlibrary",
49584958
"mavenRepositoryType": "MavenCentral"
49594959
},
4960+
{
4961+
"groupId": "org.jetbrains.kotlinx",
4962+
"artifactId": "kotlinx-serialization-json",
4963+
"version": "1.7.3",
4964+
"nugetVersion": "1.7.3.3",
4965+
"nugetId": "Xamarin.KotlinX.Serialization.Json",
4966+
"type": "androidlibrary",
4967+
"mavenRepositoryType": "MavenCentral"
4968+
},
4969+
{
4970+
"groupId": "org.jetbrains.kotlinx",
4971+
"artifactId": "kotlinx-serialization-json-jvm",
4972+
"version": "1.7.3",
4973+
"nugetVersion": "1.7.3.3",
4974+
"nugetId": "Xamarin.KotlinX.Serialization.Json.Jvm",
4975+
"type": "androidlibrary",
4976+
"mavenRepositoryType": "MavenCentral"
4977+
},
49604978
{
49614979
"groupId": "org.jetbrains.kotlinx",
49624980
"artifactId": "kotlinx-serialization-protobuf",
49634981
"version": "1.7.3",
4964-
"nugetVersion": "1.7.3.2",
4982+
"nugetVersion": "1.7.3.3",
49654983
"nugetId": "Xamarin.KotlinX.Serialization.Protobuf",
49664984
"type": "androidlibrary",
49674985
"mavenRepositoryType": "MavenCentral"
@@ -4970,7 +4988,7 @@
49704988
"groupId": "org.jetbrains.kotlinx",
49714989
"artifactId": "kotlinx-serialization-protobuf-jvm",
49724990
"version": "1.7.3",
4973-
"nugetVersion": "1.7.3.2",
4991+
"nugetVersion": "1.7.3.3",
49744992
"nugetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm",
49754993
"type": "androidlibrary",
49764994
"mavenRepositoryType": "MavenCentral"
@@ -4979,7 +4997,7 @@
49794997
"groupId": "org.jetbrains.kotlinx",
49804998
"artifactId": "kotlinx-serialization-protobuf",
49814999
"version": "1.7.3",
4982-
"nugetVersion": "1.7.3.2",
5000+
"nugetVersion": "1.7.3.3",
49835001
"nugetId": "Xamarin.KotlinX.Serialization.Protobuf",
49845002
"type": "androidlibrary",
49855003
"mavenRepositoryType": "MavenCentral"
@@ -4988,7 +5006,7 @@
49885006
"groupId": "org.jetbrains.kotlinx",
49895007
"artifactId": "kotlinx-serialization-protobuf-jvm",
49905008
"version": "1.7.3",
4991-
"nugetVersion": "1.7.3.2",
5009+
"nugetVersion": "1.7.3.3",
49925010
"nugetId": "Xamarin.KotlinX.Serialization.Protobuf.Jvm",
49935011
"type": "androidlibrary",
49945012
"mavenRepositoryType": "MavenCentral"

0 commit comments

Comments
 (0)