From daa8cb29af21e8656dd81230bea8d4f6576f1013 Mon Sep 17 00:00:00 2001
From: Daniel Ruiz de Alegría <daniel@drasite.com>
Date: Wed, 6 May 2020 20:47:36 +0200
Subject: Update action icons from Papirus icon theme

---
 Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg

(limited to 'Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg')

diff --git a/Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg b/Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg
deleted file mode 120000
index f9cf17083..000000000
--- a/Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg
+++ /dev/null
@@ -1 +0,0 @@
-edit-paste.svg
\ No newline at end of file
diff --git a/Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg b/Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg
new file mode 100644
index 000000000..ecba2ebd8
--- /dev/null
+++ b/Flat-Remix-Blue/actions/scalable/rabbitvcs-editconflicts.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" version="1.1">
+ <defs>
+  <style id="current-color-scheme" type="text/css">
+   .ColorScheme-Text { color:#5c616c; } .ColorScheme-Highlight { color:#367bf0; }
+  </style>
+ </defs>
+ <g transform="matrix(1,0,0,1,4,4)">
+  <path class="ColorScheme-Text" d="M 8 0 A 2 2 0 0 0 6 2 L 3 2 C 2.446 2 2 2.446 2 3 L 2 14 C 2 14.554 2.446 15 3 15 L 13 15 C 13.554 15 14 14.554 14 14 L 14 3 C 14 2.446 13.554 2 13 2 L 10 2 A 2 2 0 0 0 8 0 z M 8 1 A 1 1 0 0 1 9 2 A 1 1 0 0 1 8 3 A 1 1 0 0 1 7 2 A 1 1 0 0 1 8 1 z M 4 4 L 5 4 L 5 5 L 11 5 L 11 4 L 12 4 L 12 13 L 4 13 L 4 4 z" style="fill:currentColor"/>
+ </g>
+</svg>
-- 
cgit v1.2.3