From 49462664496f0c4eaf20a56251699c09874569c6 Mon Sep 17 00:00:00 2001
From: alperozturk <alper_ozturk@proton.me>
Date: Thu, 20 Feb 2025 09:47:33 +0100
Subject: [PATCH] solve git conflict

Signed-off-by: alperozturk <alper_ozturk@proton.me>
---
 gradle/verification-metadata.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index e5998a5da..a8809c019 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -18,7 +18,12 @@
          <trusted-key id="0C6914BDDF32BD0AF3AAEB8A2148325ADD28A1AD" group="^com[.]atlassian($|([.].*))" regex="true"/>
          <trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-logging" name="commons-logging" version="1.2"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
-         <trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42" group="^androidx[.]compose($|([.].*))" regex="true"/>
+         <trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42">
+            <trusting group="androidx.databinding"/>
+            <trusting group="androidx.fragment"/>
+            <trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
+            <trusting group="^com[.]android($|([.].*))" regex="true"/>
+         </trusted-key>
          <trusted-key id="0F07D1201BDDAB67CFB84EB479752DB6C966F0B8" group="com.google.android" name="annotations" version="4.1.1.4"/>
          <trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2" name="ow2" version="1.5.1"/>
          <trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F">
@@ -1192,6 +1197,11 @@
             <sha256 value="604b5e65496d8c88d5e6767e82db42dc79b74874b2ae426e4cab624867f101f3" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="androidx.fragment" name="fragment" version="1.8.6">
+         <artifact name="fragment-1.8.6.aar">
+            <sha256 value="6d5aa4c135247a7f8b59ef5d0bb2990f3a8d6502f02c763c8d34df8a410a3731" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="androidx.fragment" name="fragment-ktx" version="1.3.6">
          <artifact name="fragment-ktx-1.3.6.module">
             <sha256 value="a775bab4e5ef78605c2b0f8bc9dcd9e2c2dd6b5d5d9320012a69a5d01375059a" origin="Generated by Gradle" reason="Artifact is not signed"/>