From 3cc426e4af1512a8e652e3789a04c60cd2835eaa Mon Sep 17 00:00:00 2001
From: wolfi323 <>
Date: Mar 08 2021 17:26:06 +0000
Subject: Update akonadi-calendar to version 20.12.3 / rev 69 via SR 877007


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

---

diff --git a/.files b/.files
index f9f0d5b..aa9fddf 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 5c3e1fa..a1ecc7b 100644
--- a/.rev
+++ b/.rev
@@ -535,8 +535,6 @@
     <comment>KDE Applications 20.12.1</comment>
     <requestid>861091</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="68" vrev="1">
     <srcmd5>309df855a6c98cd8f820e636f5cd5e87</srcmd5>
     <version>20.12.2</version>
@@ -553,5 +551,4 @@
     <comment>20.12.3 release</comment>
     <requestid>877007</requestid>
   </revision>
->>>>>>> Stashed changes
 </revisionlist>
diff --git a/akonadi-calendar-20.12.1.tar.xz b/akonadi-calendar-20.12.1.tar.xz
deleted file mode 120000
index 84276e0..0000000
--- a/akonadi-calendar-20.12.1.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeihand6a7p3uyplt565ucvggz6522npdiridzcysqupqmsunjow2hq
\ No newline at end of file
diff --git a/akonadi-calendar-20.12.1.tar.xz.sig b/akonadi-calendar-20.12.1.tar.xz.sig
deleted file mode 100644
index 319dae0..0000000
--- a/akonadi-calendar-20.12.1.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/zwegACgkQ29LOiT4t
-HIeN5wf/R76Q/mAHjetYY4pVp47JzwNSsXtTV6O6Ltt7D2dItkDobl3YQnzrPio6
-tj+aJdZ0L2kxTE9yZWi+d3ahgoNFHkqDpyybRFSZRyGgHa16ZMr8pbWcIUliEGTa
-vcR1Nqm678+EI8MtYTOE9ZrEHBTglrUfdkb2KTuNGuE4H+2CsjRhkWuT38uy3XX8
-lcwIHrzjaBy6Jgj7HkHfXeRK4vXwuky+FXvsgrWGMyc8cGTNkGEXfEKMwAtb46Z8
-m/OGVHTgv2qAKnPHBNRdJpQ+hnVsxYOnCLX20y20Atqbii9CoFqmiaoPWSJisUAK
-wXOJldB3YPxDDOJ+Oy/4DH8OZNnIdg==
-=H2jn
------END PGP SIGNATURE-----
diff --git a/akonadi-calendar.changes b/akonadi-calendar.changes
index b8ca728..1baddda 100644
--- a/akonadi-calendar.changes
+++ b/akonadi-calendar.changes
@@ -1,6 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
 Thu Mar  4 06:09:15 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.3
@@ -20,7 +18,6 @@ Wed Feb  3 08:27:35 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
   * Allow instance creation using an item
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Jan  5 12:24:26 UTC 2021 - Luca Beltrame <lbeltrame@kde.org>
 
 - Update to 20.12.1
diff --git a/akonadi-calendar.spec b/akonadi-calendar.spec
index 01deba8..0bd9d2f 100644
--- a/akonadi-calendar.spec
+++ b/akonadi-calendar.spec
@@ -21,11 +21,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without lang
 Name:           akonadi-calendar
-<<<<<<< Updated upstream
-Version:        20.12.1
-=======
 Version:        20.12.3
->>>>>>> Stashed changes
 Release:        0
 Summary:        Akonadi calendar integration
 License:        LGPL-2.1-or-later