Rebased

Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>

Author: daniele-verducci

gradle/verification-metadata.xml

@@ -21859,17 +21859,10 @@
       </component>
       <component group="com.github.nextcloud" name="android-library" version="8cbaa7e8a834f5c2fa6d1f24bd3b9923aa079f28">
          <artifact name="android-library-8cbaa7e8a834f5c2fa6d1f24bd3b9923aa079f28.aar">
-<<<<<<< HEAD
             <sha256 value="f1e5006dba6b0b60466ef880e6c35aeea4bab265f9f843eff4045ed4f031d7d9" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
          <artifact name="android-library-8cbaa7e8a834f5c2fa6d1f24bd3b9923aa079f28.module">
             <sha256 value="ee94e7f4c429428709a1fd1415602ad257ad25938834e1fd7e6107512b6d4944" origin="Generated by Gradle" reason="Artifact is not signed"/>
-=======
-            <sha256 value="f1e5006dba6b0b60466ef880e6c35aeea4bab265f9f843eff4045ed4f031d7d9" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="android-library-8cbaa7e8a834f5c2fa6d1f24bd3b9923aa079f28.module">
-            <sha256 value="ee94e7f4c429428709a1fd1415602ad257ad25938834e1fd7e6107512b6d4944" origin="Generated by Gradle"/>
->>>>>>> bb17089ca0 (Updated android-library)
          </artifact>
       </component>
       <component group="com.github.nextcloud" name="android-library" version="8d492518fdc1dad42b1b5272359be1c1adfacf51">