From 74dbedcc73a7891b3d2cb3109e684d851b8c306a Mon Sep 17 00:00:00 2001
From: wolfi323 <>
Date: Mar 08 2021 17:26:54 +0000
Subject: Update akonadi-mime to version 20.12.3 / rev 56 via SR 877011


https://build.opensuse.org/request/show/877011
by user wolfi323 + dimstar_suse
20.12.3 release

---

diff --git a/.files b/.files
index a19cb99..eda1ce7 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index a91ba2f..bc8849b 100644
--- a/.rev
+++ b/.rev
@@ -431,8 +431,6 @@
     <comment>KDE Applications 20.12.1</comment>
     <requestid>861098</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="55" vrev="1">
     <srcmd5>bb617ed02518754a439f68b0640c28d0</srcmd5>
     <version>20.12.2</version>
@@ -449,5 +447,4 @@
     <comment>20.12.3 release</comment>
     <requestid>877011</requestid>
   </revision>
->>>>>>> Stashed changes
 </revisionlist>
diff --git a/akonadi-mime-20.12.1.tar.xz b/akonadi-mime-20.12.1.tar.xz
deleted file mode 120000
index e05e463..0000000
--- a/akonadi-mime-20.12.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreihfr4ohsth4bci6zeqdmzls6weneojdkktvdzrjpiu2pzyquysz64
\ No newline at end of file
diff --git a/akonadi-mime-20.12.1.tar.xz.sig b/akonadi-mime-20.12.1.tar.xz.sig
deleted file mode 100644
index 175e9ac..0000000
--- a/akonadi-mime-20.12.1.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEyBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwekACgkQ29LOiT4t
-HIdD6wf1E2Ah9tWiIjUlwFWwKaTztuaeKjuc9FOF6SBt5KCEZARGq0K/ANsuKokg
-a+7WF4uXNyRnNHfpBz9qdipn38Yg1IiaKqVWIKWHMT6ec+KIk3z0C9CgiNnBZgE/
-5zppNLdHDj/GYF2Yoc4DeHj/R0GPmd7oSzEAMA3soad1A+CzhC6dlzFBKAT1cvBO
-jWAJeo60v0eCiqrZq6tf16c7bqdLn148tX5WQYm64JN6JU7MRdvJfP+U7UlQxwDe
-XrH1SGES8iRHcxb5BRB+nzrfHDOyroCPHvIDTk6359zP0lR09KJnJIkEIzlt4/AV
-2dNloP9SJYtLJsPok6XDAeNxk0bH
-=ZYPf
------END PGP SIGNATURE-----
diff --git a/akonadi-mime.changes b/akonadi-mime.changes
index c12154f..8fe5305 100644
--- a/akonadi-mime.changes
+++ b/akonadi-mime.changes
@@ -1,6 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
 Thu Mar  4 06:09:19 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.3
@@ -19,7 +17,6 @@ Wed Feb  3 08:27:39 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
 - No code change since 20.12.1
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Jan  5 12:24:30 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.1
diff --git a/akonadi-mime.spec b/akonadi-mime.spec
index 77fc142..310b19b 100644
--- a/akonadi-mime.spec
+++ b/akonadi-mime.spec
@@ -22,11 +22,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-mime
-<<<<<<< Updated upstream
-Version:        20.12.1
-=======
 Version:        20.12.3
->>>>>>> Stashed changes
 Release:        0
 Summary:        MIME email parser for KDE PIM
 License:        LGPL-2.1-or-later