mirror of
https://github.com/walkxcode/dashboard-icons.git
synced 2025-10-29 15:57:58 +01:00
fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,28 +1 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 27.7.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#0071BC;}
|
||||
</style>
|
||||
<g transform="translate(0.000000,800.000000) scale(0.100000,-0.100000)">
|
||||
<path class="st0" d="M1033.2,7993c-41-9.6-73.7-36.5-103.8-85.2c-15.4-25-201.9-346.7-414-715.1
|
||||
c-212.7-368.5-399.2-691.4-414-717.7c-15.4-26.3-25.6-50-23.1-52.5c6.4-6.4,259.5-152.5,264.7-152.5c2.6,0,186.5,316.6,409.5,703.6
|
||||
c223,386.4,406.3,703.6,406.9,704.9c0.6,0.6,371,1.3,822.1,1.3h821.5v160.2V8000l-872.8-0.6C1449.7,7998.7,1046,7996.2,1033.2,7993
|
||||
z"/>
|
||||
<path class="st0" d="M1365.1,7394.4c-55.7-19.9-53.2-16-421.6-654.3c-192.9-334.5-351.2-610-351.2-612.6
|
||||
c0-4.5,269.1-161.5,271.7-157.6c0.6,1.3,146.7,253.8,323.6,561.3l322.3,558.8h646.6h646.6v157v157h-706.2
|
||||
C1512.5,7403.4,1385.6,7402.1,1365.1,7394.4z"/>
|
||||
<path class="st0" d="M1697.7,6779.9c-17.3-8.3-38.4-21.8-46.1-30.1c-7.7-8.3-253.1-430-546-937.5
|
||||
c-403.7-699.1-533.1-928.5-536.4-949.7c-5.1-34,0.6-67.9,16.7-98.7c41.7-80.7,1054.8-1826.3,1068.2-1841
|
||||
c9.6-9.6,28.8-23.1,43.6-30.1c26.3-12.8,39.7-12.8,1106-12.8h1079.7l33.3,16.7c18.6,9,40.4,25.6,48.7,37.2
|
||||
c30.8,40.4,203.1,345.4,198,350.5c-2.6,2.6-62.8,37.8-133.3,78.2c-86.5,50.6-130.1,72.4-135.2,67.9c-3.8-3.2-37.2-57.7-73.7-121.1
|
||||
l-66-115.3l-950.9,1.3l-950.9,1.9l-472.9,820.2l-473.6,820.2l10.9,19.2c6.4,10.3,220.4,380.6,474.8,822.1l463.3,802.3h949.7h949
|
||||
l471-815.7c258.9-447.9,471-820.9,471-827.9c0-12.2-487-864.4-508.2-888.8c-9-10.9-58.3-11.5-860.6-11.5
|
||||
c-467.8,0-852.3,1.9-853.5,5.1c-1.9,2.6,220.4,390.9,493.4,863.2c273,472.3,505,876,515.8,897.1c44.2,86.5,12.8,183.9-71.1,220.4
|
||||
l-32,13.5l-726-1.3l-726-1.9v-153.8v-153.8l572.2-1.9c315.3-0.6,571.6-3.8,570.3-6.4c-1.3-3.2-232.6-404.3-514.6-892.6l-512-886.9
|
||||
l-2.6-42.9c-1.3-23.7,0.6-53.2,5.1-66c10.3-30.8,46.1-70.5,79.5-88.4l26.3-14.1h1083h1083l25.6,14.1c14.1,7.7,34.6,23.1,45.5,35.2
|
||||
c11.5,11.5,160.8,264,331.9,561.3c228.8,396,313.4,548.5,317.8,570.3c6.4,34.6,0.6,71.8-16,103.8
|
||||
c-28.8,55.7-1045.1,1812.8-1058.6,1830.8c-9,11.5-30.8,27.6-48.7,37.2l-32.7,16H2806.9H1729.7L1697.7,6779.9z"/>
|
||||
</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 512 512"><style>.st0{fill:#0071bc}</style><path d="M103.32.7c-4.1.96-7.37 3.65-10.38 8.52-1.54 2.5-20.19 34.67-41.4 71.51-21.27 36.85-39.92 69.14-41.4 71.77-1.54 2.63-2.56 5-2.31 5.25.64.64 25.95 15.25 26.47 15.25.26 0 18.65-31.66 40.95-70.36 22.3-38.64 40.63-70.36 40.69-70.49.06-.06 37.1-.13 82.21-.13h82.15V0l-87.28.06c-48.05.07-88.42.32-89.7.64" class="st0"/><path d="M136.51 60.56c-5.57 1.99-5.32 1.6-42.16 65.43-19.29 33.45-35.12 61-35.12 61.26 0 .45 26.91 16.15 27.17 15.76.06-.13 14.67-25.38 32.36-56.13L150.99 91h129.32V59.6h-70.62c-58.44.06-71.13.19-73.18.96" class="st0"/><path d="M169.77 122.01c-1.73.83-3.84 2.18-4.61 3.01s-25.31 43-54.6 93.75c-40.37 69.91-53.31 92.85-53.64 94.97-.51 3.4.06 6.79 1.67 9.87 4.17 8.07 105.48 182.63 106.82 184.1.96.96 2.88 2.31 4.36 3.01 2.63 1.28 3.97 1.28 110.6 1.28h107.97l3.33-1.67c1.86-.9 4.04-2.56 4.87-3.72 3.08-4.04 20.31-34.54 19.8-35.05-.26-.26-6.28-3.78-13.33-7.82-8.65-5.06-13.01-7.24-13.52-6.79-.38.32-3.72 5.77-7.37 12.11l-6.6 11.53-95.09-.13-95.09-.19-47.29-82.02-47.36-82.02 1.09-1.92c.64-1.03 22.04-38.06 47.48-82.21l46.33-80.23h189.87l47.1 81.57c25.89 44.79 47.1 82.09 47.1 82.79 0 1.22-48.7 86.44-50.82 88.88-.9 1.09-5.83 1.15-86.06 1.15-46.78 0-85.23-.19-85.35-.51-.19-.26 22.04-39.09 49.34-86.32s50.5-87.6 51.58-89.71c4.42-8.65 1.28-18.39-7.11-22.04l-3.2-1.35-72.6.13-72.6.19v30.76l57.22.19c31.53.06 57.16.38 57.03.64-.13.32-23.26 40.43-51.46 89.26l-51.2 88.69-.26 4.29c-.13 2.37.06 5.32.51 6.6 1.03 3.08 4.61 7.05 7.95 8.84l2.63 1.41h216.6l2.56-1.41c1.41-.77 3.46-2.31 4.55-3.52 1.15-1.15 16.08-26.4 33.19-56.13 22.88-39.6 31.34-54.85 31.78-57.03.64-3.46.06-7.18-1.6-10.38-2.88-5.57-104.51-181.28-105.86-183.08-.9-1.15-3.08-2.76-4.87-3.72l-3.27-1.6H172.97z" class="st0"/></svg>
|
||||
|
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 1.8 KiB |
Reference in New Issue
Block a user