From 33309692e554fdb590b75faa46df47b0621f6663 Mon Sep 17 00:00:00 2001
From: AndreasKubasa <55059012+AndreasKubasa@users.noreply.github.com>
Date: Sat, 21 Nov 2020 02:24:05 +0100
Subject: [PATCH] Fixed merge conflict in ApostropheCMS.svg

---
 .../images/icons/ApostropheCMS.svg            | 36 -------------------
 1 file changed, 36 deletions(-)

diff --git a/src/drivers/webextension/images/icons/ApostropheCMS.svg b/src/drivers/webextension/images/icons/ApostropheCMS.svg
index 2b67074f8..775946684 100644
--- a/src/drivers/webextension/images/icons/ApostropheCMS.svg
+++ b/src/drivers/webextension/images/icons/ApostropheCMS.svg
@@ -1,38 +1,3 @@
-<<<<<<< HEAD
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 230.39 230.39">
-  <defs>
-    <linearGradient id="circle" x1="173.17" y1="86.95" x2="141.86" y2="141.17" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#cc9300"/>
-      <stop offset="0.47" stop-color="#ea433a"/>
-      <stop offset="1" stop-color="#b327bf"/>
-    </linearGradient>
-    <linearGradient id="Square_2" data-name="Square 2" x1="92.49" y1="41" x2="67.07" y2="110.85" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#cc9300"/>
-      <stop offset="0.26" stop-color="#ea433a"/>
-      <stop offset="0.47" stop-color="#b327bf"/>
-      <stop offset="0.76" stop-color="#66f"/>
-      <stop offset="1" stop-color="#00bf9a"/>
-    </linearGradient>
-    <linearGradient id="triangle" x1="75.13" y1="190.31" x2="120.2" y2="143.64" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#b327bf"/>
-      <stop offset="0.47" stop-color="#66f"/>
-      <stop offset="1" stop-color="#00c09a"/>
-    </linearGradient>
-  </defs>
-  <path d="M154.49,220.39l-44.16,7c-30.12,4.77-41.53,3.36-53.48-.78a62.25,62.25,0,0,1-29.59-21.5C19.63,195,14.77,184.61,10,154.49L3,110.33C-1.77,80.21-.36,68.8,3.78,56.85a62.25,62.25,0,0,1,21.5-29.59C35.36,19.63,45.78,14.77,75.9,10l44.16-7c30.12-4.77,41.53-3.36,53.48.78a62.18,62.18,0,0,1,29.58,21.5c7.64,10.08,12.5,20.5,17.27,50.62l7,44.16c4.77,30.12,3.36,41.53-.78,53.48a62.18,62.18,0,0,1-21.5,29.58C195,210.76,184.61,215.62,154.49,220.39Z" style="fill-rule: evenodd"/>
-  <g id="Group-2-Copy-4">
-    <g id="Group-Copy-5">
-      <g id="Group-4-Copy-10">
-        <g id="Group-21">
-          <path id="Oval-Copy-84" d="M162.43,145.1a31.43,31.43,0,1,0-35.65-26.17A31.28,31.28,0,0,0,162.43,145.1Zm-1.57-9.94a21.37,21.37,0,1,1,17.45-24.39A21.2,21.2,0,0,1,160.86,135.16Z" style="fill: url(#circle)"/>
-          <path id="Rectangle-Copy-64" d="M61,107.94l46.64-7.38a5,5,0,0,0,4.18-5.76l-7.4-46.71a5,5,0,0,0-5.76-4.19L52,51.29a5,5,0,0,0-4.18,5.76l7.4,46.71A5,5,0,0,0,61,107.94Zm3.39-10.72L58.52,60.45l36.7-5.81L101,91.41Z" style="fill: url(#Square_2)"/>
-          <path id="Triangle-Copy-15" d="M90.56,124.91,70.33,181.56a5,5,0,0,0,5.53,6.67l56.94-9a5,5,0,0,0,3.2-8.05L99.29,123.53A5,5,0,0,0,90.56,124.91ZM96.94,137l25.91,33.62L82.66,177Z" style="fill: url(#triangle)"/>
-        </g>
-      </g>
-    </g>
-  </g>
-</svg>
-=======
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M15.2278 30.0135C11.5313 30.6204 10.0968 30.3997 8.60715 29.9031C7.1401 29.4057 5.86636 28.4601 4.96577 27.1997L4.80025 27.0342C3.97267 25.8755 3.36577 24.5514 2.81405 21.1307L1.93129 15.3928C1.32439 11.641 1.48991 10.2066 2.04163 8.71691C2.5563 7.25868 3.47472 5.97672 4.68991 5.02036L4.9106 4.85484C6.06922 4.02725 7.39336 3.42036 10.7589 2.86863L16.3865 1.98587C20.083 1.37898 21.5175 1.59967 23.0071 2.09622C24.4742 2.59363 25.7479 3.53928 26.6485 4.79967L26.814 5.02036C27.6416 6.17898 28.2485 7.50312 28.8003 10.9238L29.683 16.6066C30.2899 20.3583 30.1244 21.7928 29.5727 23.2824C29.076 24.7499 28.1542 26.0366 26.9244 26.979L26.7037 27.1445C25.5451 27.9721 24.2209 28.579 20.8554 29.1307L15.2278 30.0135Z" fill="black"/>
 <path d="M21.5227 19.8072C23.4424 19.8072 24.9986 18.251 24.9986 16.3313C24.9986 14.4117 23.4424 12.8555 21.5227 12.8555C19.6031 12.8555 18.0469 14.4117 18.0469 16.3313C18.0469 18.251 19.6031 19.8072 21.5227 19.8072Z" fill="black" stroke="url(#paint0_linear)" stroke-width="2.42" stroke-linejoin="round"/>
@@ -58,4 +23,3 @@
 </linearGradient>
 </defs>
 </svg>
->>>>>>> dffac961239cb3ed09863b0431d3b758236ee62a