Skip to content

Commit 693a8af

Browse files
alperozturk96AndyScherzinger
authored andcommitted
solve git conflict
Signed-off-by: alperozturk <[email protected]>
1 parent 9f613f8 commit 693a8af

File tree

1 file changed

+11
-1
lines changed

1 file changed

+11
-1
lines changed

gradle/verification-metadata.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
<trusted-key id="0C6914BDDF32BD0AF3AAEB8A2148325ADD28A1AD" group="^com[.]atlassian($|([.].*))" regex="true"/>
1919
<trusted-key id="0CC641C3A62453AB390066C4A41F13C999945293" group="commons-logging" name="commons-logging" version="1.2"/>
2020
<trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
21-
<trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42" group="^androidx[.]compose($|([.].*))" regex="true"/>
21+
<trusted-key id="0F06FF86BEEAF4E71866EE5232EE5355A6BC6E42">
22+
<trusting group="androidx.databinding"/>
23+
<trusting group="androidx.fragment"/>
24+
<trusting group="^androidx[.]compose($|([.].*))" regex="true"/>
25+
<trusting group="^com[.]android($|([.].*))" regex="true"/>
26+
</trusted-key>
2227
<trusted-key id="0F07D1201BDDAB67CFB84EB479752DB6C966F0B8" group="com.google.android" name="annotations" version="4.1.1.4"/>
2328
<trusted-key id="10F3C7A02ECA55E502BADCF3991EFB94DB91127D" group="org.ow2" name="ow2" version="1.5.1"/>
2429
<trusted-key id="147B691A19097624902F4EA9689CBE64F4BC997F">
@@ -1192,6 +1197,11 @@
11921197
<sha256 value="604b5e65496d8c88d5e6767e82db42dc79b74874b2ae426e4cab624867f101f3" origin="Generated by Gradle"/>
11931198
</artifact>
11941199
</component>
1200+
<component group="androidx.fragment" name="fragment" version="1.8.6">
1201+
<artifact name="fragment-1.8.6.aar">
1202+
<sha256 value="6d5aa4c135247a7f8b59ef5d0bb2990f3a8d6502f02c763c8d34df8a410a3731" origin="Generated by Gradle"/>
1203+
</artifact>
1204+
</component>
11951205
<component group="androidx.fragment" name="fragment-ktx" version="1.3.6">
11961206
<artifact name="fragment-ktx-1.3.6.module">
11971207
<sha256 value="a775bab4e5ef78605c2b0f8bc9dcd9e2c2dd6b5d5d9320012a69a5d01375059a" origin="Generated by Gradle" reason="Artifact is not signed"/>

0 commit comments

Comments
 (0)