solve git conflicts

Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk 2025-06-03 19:30:48 +08:00
parent 70ea4b3a33
commit 49838e1467
No known key found for this signature in database
GPG Key ID: 4E577DC593B59BDF

View File

@ -10,7 +10,7 @@
*/ */
buildscript { buildscript {
ext { ext {
androidLibraryVersion ="8e561c7e65f208492c20b106eb25cfbe43dc7189" androidLibraryVersion ="efceb970c7"
androidCommonLibraryVersion = "0.25.0" androidCommonLibraryVersion = "0.25.0"
androidPluginVersion = "8.9.2" androidPluginVersion = "8.9.2"
androidxMediaVersion = "1.5.1" androidxMediaVersion = "1.5.1"