mirror of
https://github.com/walkxcode/dashboard-icons.git
synced 2025-11-27 15:18:41 +01:00
fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 340.2 171.5" style="enable-background:new 0 0 340.2 171.5" xml:space="preserve"><style type="text/css">.st0{fill:#1ca07a}</style><g id="Page-1"><g id="logo"><g id="Group-23"><path id="Fill-22" d="M38.6,52.1c1.2-5,6-8.9,14-11.7c7.8-2.7,18.3-4.2,31.3-4.5c4.1-0.1,11.4-0.1,17.4,0.1 c-10,14-15.9,31.2-15.9,49.8c0,3.3,0.2,6.6,0.6,9.9c-5.4-2.6-10.4-5.2-15-7.8C59.6,81.4,51,75.1,45.4,69 C39.6,62.7,37.3,57,38.6,52.1L38.6,52.1z M241.4,134.7c9.7-13.9,15.3-30.8,15.3-49c0-3.7-0.2-7.3-0.7-10.8c5.3,2.6,11.7,6,15.3,8 c11.3,6.4,19.9,12.8,25.5,18.8c5.8,6.3,8.1,12,6.8,17c-1.2,5-6,8.9-14,11.7c-7.8,2.7-18.3,4.2-31.3,4.5 C253,135.1,247.3,135,241.4,134.7L241.4,134.7z M9.2,68.1c7.1,7.7,18.1,15.9,32.6,24.1c13.9,7.9,30.4,15.5,48.6,22.6 c11.9,33.1,43.5,56.7,80.6,56.7c16,0,30.9-4.4,43.7-12c0,0-42.7-7.1-66-25.8c3.2,0.9,6.4,1.7,9.6,2.5 c45.4,11.4,89.2,17.2,123.5,16.4c16.7-0.4,30.2-2.3,40.1-5.8c10.3-3.6,16.3-8.6,17.9-14.9c1.6-6.3-1.4-13.6-8.7-21.6 c-7.1-7.7-18.1-15.9-32.6-24.1c-11.6-6.6-28.9-14.5-44.3-20.8C245.1,27.9,211.3,0,170.9,0c-25.1,0-47.7,10.8-63.3,28 c-11.5-0.8-36.1-2.5-49.3-2.2c-16.7,0.4-30.2,2.3-40.1,5.8C8,35.2,2,40.2,0.4,46.5S1.8,60.1,9.2,68.1L9.2,68.1z" class="st0"/><path id="Fill-24" d="M69.5,138.4c0,7.7-6.3,14-14,14s-14-6.3-14-14c0-7.7,6.3-14,14-14 C63.3,124.4,69.5,130.7,69.5,138.4" class="st0"/><path id="Fill-25" d="M287.2,43.9c0,4.6-3.8,8.4-8.4,8.4s-8.4-3.8-8.4-8.4s3.8-8.4,8.4-8.4 C283.4,35.5,287.2,39.2,287.2,43.9" class="st0"/><path id="Fill-26" d="M88.1,152.4c0,2.9-2.3,5.2-5.2,5.2s-5.2-2.3-5.2-5.2s2.3-5.2,5.2-5.2S88.1,149.5,88.1,152.4" class="st0"/></g></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 340.2 171.5"><style>.st0{fill:#1ca07a}</style><g id="Page-1"><g id="logo"><g id="Group-23"><path id="Fill-22" d="M38.6 52.1c1.2-5 6-8.9 14-11.7 7.8-2.7 18.3-4.2 31.3-4.5 4.1-.1 11.4-.1 17.4.1-10 14-15.9 31.2-15.9 49.8q0 4.95.6 9.9-8.1-3.9-15-7.8C59.6 81.4 51 75.1 45.4 69c-5.8-6.3-8.1-12-6.8-16.9m202.8 82.6c9.7-13.9 15.3-30.8 15.3-49 0-3.7-.2-7.3-.7-10.8 5.3 2.6 11.7 6 15.3 8 11.3 6.4 19.9 12.8 25.5 18.8 5.8 6.3 8.1 12 6.8 17-1.2 5-6 8.9-14 11.7-7.8 2.7-18.3 4.2-31.3 4.5-5.3.2-11 .1-16.9-.2M9.2 68.1c7.1 7.7 18.1 15.9 32.6 24.1 13.9 7.9 30.4 15.5 48.6 22.6 11.9 33.1 43.5 56.7 80.6 56.7 16 0 30.9-4.4 43.7-12 0 0-42.7-7.1-66-25.8 3.2.9 6.4 1.7 9.6 2.5 45.4 11.4 89.2 17.2 123.5 16.4 16.7-.4 30.2-2.3 40.1-5.8 10.3-3.6 16.3-8.6 17.9-14.9s-1.4-13.6-8.7-21.6c-7.1-7.7-18.1-15.9-32.6-24.1-11.6-6.6-28.9-14.5-44.3-20.8C245.1 27.9 211.3 0 170.9 0c-25.1 0-47.7 10.8-63.3 28-11.5-.8-36.1-2.5-49.3-2.2-16.7.4-30.2 2.3-40.1 5.8C8 35.2 2 40.2.4 46.5s1.4 13.6 8.8 21.6" class="st0"/><path id="Fill-24" d="M69.5 138.4c0 7.7-6.3 14-14 14s-14-6.3-14-14 6.3-14 14-14c7.8 0 14 6.3 14 14" class="st0"/><path id="Fill-25" d="M287.2 43.9c0 4.6-3.8 8.4-8.4 8.4s-8.4-3.8-8.4-8.4 3.8-8.4 8.4-8.4 8.4 3.7 8.4 8.4" class="st0"/><path id="Fill-26" d="M88.1 152.4c0 2.9-2.3 5.2-5.2 5.2s-5.2-2.3-5.2-5.2 2.3-5.2 5.2-5.2 5.2 2.3 5.2 5.2" class="st0"/></g></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.4 KiB |
Reference in New Issue
Block a user