fix git conflict

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

gradle/verification-metadata.xml

@@ -8,6 +8,7 @@
          <trust file=".*-sources[.]jar" regex="true" reason="Android Studio downloads source jars but doesn't add checksums - fixes building in AS"/>
       </trusted-artifacts>
       <ignored-keys>
+         <ignored-key id="1DE461528F1F1B2A" reason="Key couldn't be downloaded from any key server"/>
          <ignored-key id="EB095DA7D2F6AC0E" reason="Key couldn't be downloaded from any key server"/>
       </ignored-keys>
       <trusted-keys>
@@ -166,7 +167,10 @@
          <trusted-key id="AA70C7C433D501636392EC02153E7A3C2B4E5118" group="org.eclipse.ee4j" name="project"/>
          <trusted-key id="AFCC4C7594D09E2182C60E0F7A01B0F236E5430F" group="com.google.code.gson"/>
          <trusted-key id="B02335AA54CCF21E52BBF9ABD9C565AA72BA2FDD" group="io.grpc"/>
-         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314" group="org.apache.commons" name="commons-parent" version="52"/>
+         <trusted-key id="B6E73D84EA4FCC47166087253FAAD2CD5ECBB314">
+            <trusting group="org.apache.commons"/>
+            <trusting group="org.apache.commons" name="commons-parent" version="52"/>
+         </trusted-key>
          <trusted-key id="B801E2F8EF035068EC1139CC29579F18FA8FD93B" group="com.google.j2objc" name="j2objc-annotations" version="1.3"/>
          <trusted-key id="BC87A3FD0A54480F0BADBEBD21939FF0CA2A6567" group="commons-codec" name="commons-codec" version="1.15"/>
          <trusted-key id="BCC135FC7ED8214F823D73E97FE9900F412D622E" group="com.google.flatbuffers" name="flatbuffers-java" version="1.12.0"/>
@@ -6165,6 +6169,14 @@
             <sha256 value="ce28456d366507ca0f91022942a05e388fd98f862a6d8db3105c5c4497a74ce5" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.bitfireAT" name="dav4jvm" version="2.2.1">
+         <artifact name="dav4jvm-2.2.1.jar">
+            <sha256 value="e6b8a9ff7ada0841198b18de2d6fd935f1f8754d3c84b8e8e3dc1840648d595d" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="dav4jvm-2.2.1.module">
+            <sha256 value="977a16e0c70ee01139463fd4cbd9efd7d7a767c0c8b3e72941b69cbdd2f085d3" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.bumptech.glide" name="annotations" version="4.16.0">
          <artifact name="annotations-4.16.0.jar">
             <sha256 value="c59e39b1b31b4d5592277cd90012149d740b569d4338f56443cac82c3fbda3d1" origin="Generated by Gradle"/>
@@ -6292,6 +6304,14 @@
             <sha256 value="a7f8261ce3bc9e7196280c135b993666ae2682c26d1a7cb613b9ac7e15eeddea" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="2.19.0">
+         <artifact name="android-library-2.19.0.aar">
+            <sha256 value="638229c571aea3f28168a84323307806c34ef6e90459242ff115add9c6ca4a67" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-2.19.0.module">
+            <sha256 value="828a431c00178ed0a0e7d51b7959f785be8266869dcb539dacaf0fc909b92b11" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud.android-common" name="core" version="0.14.0">
          <artifact name="core-0.14.0.aar">
             <sha256 value="d370010eeae5928f525f31c09e33f9c78ed5e610af4b9f84b1ba68ce0727267b" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -7314,6 +7334,11 @@
             <sha256 value="19ebc6f4bdb4edbb3d07b6ee994f846b54ef295582a9b5634719ffa9f31d03b2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.google.guava" name="guava" version="31.1-android">
+         <artifact name="guava-31.1-android.pom">
+            <sha256 value="66292995644e95537ee97a89e8990171d8f3c26acf984830a7791997073d451d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.google.guava" name="guava" version="31.1-jre">
          <artifact name="guava-31.1-jre.jar">
             <sha256 value="a42edc9cab792e39fe39bb94f3fca655ed157ff87a8af78e1d6ba5b07c4a00ab" origin="Generated by Gradle"/>
@@ -7847,6 +7872,22 @@
             <sha256 value="c86ee198a35a3715487860f419cbf642e7e4d9e8714777947dbe6a4e3a20ab58" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="commons-codec" name="commons-codec" version="1.2">
+         <artifact name="commons-codec-1.2.jar">
+            <sha256 value="9898a3b3857676128987b975d0b0f035becf3da5cf677266a34d6636f2b80542" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="commons-codec-1.2.pom">
+            <sha256 value="28d6c089355487fd2e973e091a152727ac27ad2b2c1ec9cbcf916a10fc863148" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
+      <component group="commons-httpclient" name="commons-httpclient" version="3.1">
+         <artifact name="commons-httpclient-3.1.jar">
+            <pgp value="0785B3EFF60B1B1BEA94E0BB7C25280EAE63EBE5"/>
+         </artifact>
+         <artifact name="commons-httpclient-3.1.pom">
+            <sha256 value="8a9b07d458d3e730221dbecdfafa7353ec1babd3b94c843227c47104a90c6d6c" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="commons-io" name="commons-io" version="2.13.0">
          <artifact name="commons-io-2.13.0.jar">
             <sha256 value="671eaa39688dac2ffaa4645b3c9980ae2d0ea2471e4ae6a5da199cd15ae23666" origin="Generated by Gradle"/>
@@ -8391,6 +8432,11 @@
             <sha256 value="31ce606f4e9518936299bb0d27c978fa61e185fd1de7c9874fe959a53e34a685" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="org.apache" name="apache" version="10">
+         <artifact name="apache-10.pom">
+            <pgp value="190D5A957FF22273E601F7A7C92C5FEC70161C62"/>
+         </artifact>
+      </component>
       <component group="org.apache" name="apache" version="13">
          <artifact name="apache-13.pom">
             <pgp value="F254B35617DC255D9344BCFA873A8E86B4372146"/>
@@ -8532,6 +8578,19 @@
             <sha256 value="dfbfd6ffe2a784ca9817c46365aa7f8a578320b805bde39d6f55a0b09d8aa8ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-parent" version="2.13.5">
+         <artifact name="jackrabbit-parent-2.13.5.pom">
+            <sha256 value="19c3041c3851aa7f55f5001c427a45cfc0509ec6febd4b2c18e0a72bbfff2aa5" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
+      <component group="org.apache.jackrabbit" name="jackrabbit-webdav" version="2.13.5">
+         <artifact name="jackrabbit-webdav-2.13.5.jar">
+            <sha256 value="5b4734a237e6b409016fbcee7d21f8114746a8fd18f4f24587cf8974bcbd09c0" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+         <artifact name="jackrabbit-webdav-2.13.5.pom">
+            <sha256 value="3685bd8ec1f22fc9623883583472665404f1d028aeb4bb705f84f43a03b272e8" origin="Generated by Gradle" reason="A key couldn't be downloaded"/>
+         </artifact>
+      </component>
       <component group="org.bitbucket.b_c" name="jose4j" version="0.9.5">
          <artifact name="jose4j-0.9.5.jar">
             <sha256 value="808fb3166f3e67dad9811c331029ab1681242fd52b735bc3f33f281167fcc72e" origin="Generated by Gradle"/>
@@ -9089,6 +9148,11 @@
             <sha256 value="4551e2c04331e1659fdb990dbcdd99606d8734b5a408df0a7b3b85b8c2984d70" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.0.0">
+         <artifact name="kotlin-gradle-plugins-bom-2.0.0.pom">
+            <sha256 value="c4a0586af77f0fb4f7e367033a02ac718beff0d0193cc7989583a982aa2752f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-gradle-plugins-bom" version="2.1.0">
          <artifact name="kotlin-gradle-plugins-bom-2.1.0.module">
             <sha256 value="a81bd9adbd3ba75a05a6c3a3ed846e0c92a5a7ac4ce8363cf604b4f2c8a7b75c" origin="Generated by Gradle"/>