fix git conflict

Signed-off-by: alperozturk <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/res/values/strings.xml

@@ -10,8 +10,8 @@
     <string name="bottom_navigation_menu_favorites_label">Favorites</string>
     <string name="bottom_navigation_menu_assistant_label">Assistant</string>
     <string name="bottom_navigation_menu_media_label">Media</string>
-
-
+    <string name="file_list_error_headline">Poor connection</string>
+    <string name="file_list_error_description">Check your internet connection or try again later</string>
     <string name="about_android">%1$s Android app</string>
     <string name="about_version">version %1$s</string>
     <string name="about_version_with_build">version %1$s, build #%2$s</string>

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.29.0"
 androidGifDrawableVersion = "1.2.29"
 androidImageCropperVersion = "4.6.0"
-androidLibraryVersion = "3546bd82fc"
+androidLibraryVersion = "8c77f600ac942f6eb4e3c4447143fc949d34acc6"
 androidPluginVersion = '8.13.0'
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"

gradle/verification-metadata.xml

@@ -17839,6 +17839,14 @@
             <sha256 value="366e1217b642efa6f8ee8334b265169a8860c5e5425159715891509474b30df8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="8c77f600ac942f6eb4e3c4447143fc949d34acc6">
+         <artifact name="android-library-8c77f600ac942f6eb4e3c4447143fc949d34acc6.aar">
+            <sha256 value="8123aaea5d9c2fa439a635bb64d16ec532c596a4a2dd76e18da2fe729ab886ba" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-8c77f600ac942f6eb4e3c4447143fc949d34acc6.module">
+            <sha256 value="1bcc9a70ccdad8253705dd2a4bd173155ee3a828bd26e5f3047bf246facd3e59" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="8e561c7e65f208492c20b106eb25cfbe43dc7189">
          <artifact name="android-library-8e561c7e65f208492c20b106eb25cfbe43dc7189.aar">
             <sha256 value="d772821c93ced5f256dfc150f90bac38358ea037fa90ac80614cfd089c3996e6" origin="Generated by Gradle" reason="Artifact is not signed"/>