From 9f0666531b53df666a8166914f30cac89ea7e1a5 Mon Sep 17 00:00:00 2001
From: RBrownSUSE <>
Date: Apr 21 2021 23:27:17 +0000
Subject: Update abseil-cpp to version 20210324.0 / rev 17 via SR 886674


https://build.opensuse.org/request/show/886674
by user RBrownSUSE + dimstar_suse

---

diff --git a/.files b/.files
index 69c051d..7058e1b 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index f96f8c5..7f28e08 100644
--- a/.rev
+++ b/.rev
@@ -145,8 +145,6 @@
     <comment></comment>
     <requestid>860444</requestid>
   </revision>
-<<<<<<< Updated upstream
-=======
   <revision rev="17" vrev="1">
     <srcmd5>e1a81faba8590f82335dfd1d0df87319</srcmd5>
     <version>20210324.0</version>
@@ -155,5 +153,4 @@
     <comment></comment>
     <requestid>886674</requestid>
   </revision>
->>>>>>> Stashed changes
 </revisionlist>
diff --git a/.servicemark b/.servicemark
deleted file mode 100644
index a336035..0000000
--- a/.servicemark
+++ /dev/null
@@ -1 +0,0 @@
-102158960fa2d0b10ef7aa2a1f6b1c64
diff --git a/abseil-cpp-20200923.2.tar.gz b/abseil-cpp-20200923.2.tar.gz
deleted file mode 120000
index 91f9ca8..0000000
--- a/abseil-cpp-20200923.2.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeietu2u762rpp5y3am7wzhixloikwmwu5ke27kxa5alhlr6j6ysog4
\ No newline at end of file
diff --git a/abseil-cpp.changes b/abseil-cpp.changes
index eb646cc..8dfd801 100644
--- a/abseil-cpp.changes
+++ b/abseil-cpp.changes
@@ -1,6 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
 Tue Apr 13 18:39:09 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 
 - Update to LTS version 20210324.0
@@ -22,7 +20,6 @@ Tue Apr 13 18:39:09 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 - Call ldconfig on post and postun
 
 -------------------------------------------------------------------
->>>>>>> Stashed changes
 Tue Dec 29 12:18:55 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
 
 - Update to version 20200923.2
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index e3418ea..9831822 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -17,11 +17,7 @@
 
 
 Name:           abseil-cpp
-<<<<<<< Updated upstream
-Version:        20200923.2
-=======
 Version:        20210324.0
->>>>>>> Stashed changes
 Release:        0
 Summary:        C++11 libraries which augment the C++ stdlib
 License:        Apache-2.0