mirror of
https://github.com/nextcloud/android.git
synced 2024-12-18 06:51:55 +03:00
Fix git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
parent
c5171d33d1
commit
96deb984e4
1 changed files with 8 additions and 0 deletions
|
@ -3978,6 +3978,14 @@
|
||||||
<sha256 value="9f5dc2343cdf500b2cc17756418fce0506d13ef480ab8276cda415950e795991" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
<sha256 value="9f5dc2343cdf500b2cc17756418fce0506d13ef480ab8276cda415950e795991" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||||
</artifact>
|
</artifact>
|
||||||
</component>
|
</component>
|
||||||
|
<component group="com.github.nextcloud" name="android-library" version="6dcffdb0ba">
|
||||||
|
<artifact name="android-library-6dcffdb0ba.aar">
|
||||||
|
<sha256 value="00e121d803e9258b36cb2d6e20904552c9e88dbff6b193b3b9adc0fcd224959a" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||||
|
</artifact>
|
||||||
|
<artifact name="android-library-6dcffdb0ba.module">
|
||||||
|
<sha256 value="0e72841878595f83c6d8f93aa51f78a67e821f53446fcb7a5d94cfaad8ebbbac" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||||
|
</artifact>
|
||||||
|
</component>
|
||||||
<component group="com.github.nextcloud" name="android-library" version="acc7df66e4a43ed7f450136c13753f2743fb245e">
|
<component group="com.github.nextcloud" name="android-library" version="acc7df66e4a43ed7f450136c13753f2743fb245e">
|
||||||
<artifact name="android-library-acc7df66e4a43ed7f450136c13753f2743fb245e.aar">
|
<artifact name="android-library-acc7df66e4a43ed7f450136c13753f2743fb245e.aar">
|
||||||
<sha256 value="f30c2d22c923c6ff8c605eb4cf713cfaf49eb967611f70dc3d139725b0891483" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
<sha256 value="f30c2d22c923c6ff8c605eb4cf713cfaf49eb967611f70dc3d139725b0891483" origin="Generated by Gradle" reason="Artifact is not signed"/>
|
||||||
|
|
Loading…
Reference in a new issue