fix: resolve merge conflicts
This commit is contained in:
Dashboard Icons Bot
committed by
Bjorn Lammers
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
+1
-159
@@ -1,159 +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="svg8" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" inkscape:export-xdpi="6.1319842" inkscape:export-ydpi="6.1319842"
|
||||
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:#1A1A1A;}
|
||||
.st1{fill:#CCCCCC;}
|
||||
.st2{fill:#F2F2F2;}
|
||||
.st3{fill:#F9F9F9;}
|
||||
.st4{fill:url(#path3915-7_00000103946600421525862600000018407772288349500329_);}
|
||||
.st5{fill:url(#path3915_00000032646258120292234060000012056840649076932760_);}
|
||||
</style>
|
||||
<defs>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect4013" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect4009" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect4005" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect4001" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3997" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3993" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3925" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3921" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3917" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3913" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3909" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3905" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3901" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3897" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3893" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3889" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3885" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3881" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3877" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3873" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3869" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3865" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3845" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3841" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3837" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3833" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3828" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3824" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3820" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3816" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3812" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect effect="simplify" helper_size="0" id="path-effect3808" is_visible="true" lpeversion="1" simplify_individual_paths="false" simplify_just_coalesce="false" smooth_angles="360" steps="1" threshold="0.00961538">
|
||||
</inkscape:path-effect>
|
||||
|
||||
<inkscape:path-effect copytype="single_stretched" effect="skeletal" fuse_tolerance="0" hide_knot="false" id="path-effect3804" is_visible="true" lpeversion="1" normal_offset="0" pattern="M 0,5 C 0,2.24 2.24,0 5,0 7.76,0 10,2.24 10,5 10,7.76 7.76,10 5,10 2.24,10 0,7.76 0,5 Z" prop_scale="1" prop_units="false" scale_y_rel="false" spacing="0" tang_offset="0" vertical_pattern="false">
|
||||
</inkscape:path-effect>
|
||||
</defs>
|
||||
<sodipodi:namedview bordercolor="#666666" borderopacity="1.0" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="230.3361" inkscape:cy="295.24545" inkscape:document-rotation="0" inkscape:document-units="px" inkscape:guide-bbox="true" inkscape:lockguides="false" inkscape:pagecheckerboard="true" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:snap-bbox="false" inkscape:snap-global="false" inkscape:window-height="1025" inkscape:window-maximized="1" inkscape:window-width="1867" inkscape:window-x="1973" inkscape:window-y="27" inkscape:zoom="1.2305198" pagecolor="#ffffff" showgrid="true" showguides="true" units="px">
|
||||
</sodipodi:namedview>
|
||||
<g>
|
||||
<g id="layer2" transform="translate(-35.555122,-5.6152164)" inkscape:groupmode="layer" inkscape:label="art">
|
||||
<ellipse id="path970" class="st0" cx="285.2" cy="263.7" rx="249.7" ry="245.9"/>
|
||||
<g id="g105" transform="matrix(1.1856074,0,0,1.1844558,-17.344671,-2.9471581)">
|
||||
<path id="path3475" class="st1" d="M145.8,110.9v266.7l-62-50.2V110.9H145.8z"/>
|
||||
<path id="path3473" class="st1" d="M328,110.9v266.7l62-50.2V110.9H328z"/>
|
||||
<path id="path3477" class="st2" d="M83.8,110.9h62l127.9,173.9h-62L83.8,110.9z"/>
|
||||
<path id="path3411" class="st3" d="M328,110.9L211.7,284.8v123.7h62V284.8L390,110.9H328z"/>
|
||||
<rect id="rect3958-5" x="329.4" y="229.2" class="st1" width="39.2" height="19.7"/>
|
||||
<path id="rect3958" class="st1" d="M355.8,211.9h34c0.1,0,0.2,0.1,0.2,0.2v27.2c0,0.1-0.1,0.2-0.2,0.2h-34
|
||||
c-0.1,0-0.2-0.1-0.2-0.2v-27.2C355.6,212,355.7,211.9,355.8,211.9z"/>
|
||||
<path id="rect3958-3" class="st1" d="M328.5,248.7h32.7c0.1,0,0.2,0.1,0.2,0.2v25.4c0,0.1-0.1,0.2-0.2,0.2h-32.7
|
||||
c-0.1,0-0.2-0.1-0.2-0.2v-25.4C328.3,248.8,328.4,248.7,328.5,248.7z"/>
|
||||
<path id="rect3958-3-5" class="st1" d="M328.6,326.9h32.7c0.1,0,0.2,0.1,0.2,0.2v20.7c0,0.1-0.1,0.2-0.2,0.2h-32.7
|
||||
c-0.1,0-0.2-0.1-0.2-0.2v-20.7C328.3,327,328.4,326.9,328.6,326.9z"/>
|
||||
</g>
|
||||
<g id="g109" transform="matrix(1.2362982,0,0,1.2636615,-39.704862,-13.358314)">
|
||||
|
||||
<linearGradient id="path3915-7_00000017507385349940871880000003704836091050032289_" gradientUnits="userSpaceOnUse" x1="113.9999" y1="468.7013" x2="147.8241" y2="467.1978" gradientTransform="matrix(3.7795 0 0 -3.7795 -59.3945 1916.1223)">
|
||||
<stop offset="0" style="stop-color:#007F00"/>
|
||||
<stop offset="1" style="stop-color:#00CE00"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path3915-7" inkscape:transform-center-x="11.174241" inkscape:transform-center-y="16.05308" style="fill:url(#path3915-7_00000017507385349940871880000003704836091050032289_);" d="
|
||||
M470.5,153.7c-6.8-8.1-14.7-15.3-23.3-21.5c-19.7-14.2-44.4-24.2-69.1-20.3c-17.7,2.8-32.6,15.3-40.5,31.1l0,0c0,0,0,0,0,0
|
||||
c0,0.1-0.1,0.1-0.1,0.2l0.3,0c1.6,1.6,3.1,3.2,4.7,4.7c16.8,16.3,37.5,31.1,61.6,32.5c24.9,1.5,48.4-9.1,69.6-21.1l1.2,0.1
|
||||
C473.6,157.5,472.1,155.6,470.5,153.7L470.5,153.7z"/>
|
||||
|
||||
<linearGradient id="path3915_00000181046024818449407710000014278626011484933562_" gradientUnits="userSpaceOnUse" x1="107.2788" y1="475.2568" x2="138.0775" y2="501.2861" gradientTransform="matrix(3.7795 0 0 -3.7795 -59.3945 1916.1223)">
|
||||
<stop offset="0" style="stop-color:#00A800"/>
|
||||
<stop offset="1" style="stop-color:#00E700"/>
|
||||
</linearGradient>
|
||||
<path id="path3915" style="fill:url(#path3915_00000181046024818449407710000014278626011484933562_);" d="M454.8,21.3
|
||||
c-13.3,0-26.5,1.8-39.4,5.1c-29.4,7.6-58.9,23.3-74.9,50c-11.5,19.2-11.4,43.6-2.5,63.7l0,0c0,0,0,0,0.1,0c0,0.1,0.1,0.2,0.1,0.3
|
||||
l0.3-0.3c2.8-0.2,5.6-0.5,8.3-0.8c29.1-3.1,59.9-11.1,80.7-33c21.4-22.7,30-53.8,35.4-83.7l1.1-1.1
|
||||
C460.9,21.4,457.9,21.3,454.8,21.3L454.8,21.3z"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="layer1" inkscape:groupmode="layer" inkscape:label="leaf" sodipodi:insensitive="true">
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="svg8" x="0" y="0" version="1.1" viewBox="0 0 512 512"><style>.st1{fill:#ccc}</style><g id="layer2" transform="translate(-35.555 -5.615)"><ellipse id="path970" cx="285.2" cy="263.7" rx="249.7" ry="245.9" style="fill:#1a1a1a"/><g id="g105" transform="matrix(1.1856 0 0 1.18446 -17.345 -2.947)"><path id="path3475" d="M145.8 110.9v266.7l-62-50.2V110.9z" class="st1"/><path id="path3473" d="M328 110.9v266.7l62-50.2V110.9z" class="st1"/><path id="path3477" d="M83.8 110.9h62l127.9 173.9h-62z" style="fill:#f2f2f2"/><path id="path3411" d="M328 110.9 211.7 284.8v123.7h62V284.8L390 110.9z" style="fill:#f9f9f9"/><path id="rect3958-5" d="M329.4 229.2h39.2v19.7h-39.2z" class="st1"/><path id="rect3958" d="M355.8 211.9h34c.1 0 .2.1.2.2v27.2c0 .1-.1.2-.2.2h-34c-.1 0-.2-.1-.2-.2v-27.2c0-.1.1-.2.2-.2" class="st1"/><path id="rect3958-3" d="M328.5 248.7h32.7c.1 0 .2.1.2.2v25.4c0 .1-.1.2-.2.2h-32.7c-.1 0-.2-.1-.2-.2v-25.4c0-.1.1-.2.2-.2" class="st1"/><path id="rect3958-3-5" d="M328.6 326.9h32.7c.1 0 .2.1.2.2v20.7c0 .1-.1.2-.2.2h-32.7c-.1 0-.2-.1-.2-.2v-20.7c-.1-.1 0-.2.2-.2" class="st1"/></g><g id="g109" transform="matrix(1.2363 0 0 1.26366 -39.705 -13.358)"><linearGradient id="path3915-7_00000017507385349940871880000003704836091050032289_" x1="114" x2="147.824" y1="468.701" y2="467.198" gradientTransform="matrix(3.7795 0 0 -3.7795 -59.395 1916.122)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#007f00"/><stop offset="1" style="stop-color:#00ce00"/></linearGradient><path id="path3915-7" d="M470.5 153.7c-6.8-8.1-14.7-15.3-23.3-21.5-19.7-14.2-44.4-24.2-69.1-20.3-17.7 2.8-32.6 15.3-40.5 31.1 0 .1-.1.1-.1.2h.3c1.6 1.6 3.1 3.2 4.7 4.7 16.8 16.3 37.5 31.1 61.6 32.5 24.9 1.5 48.4-9.1 69.6-21.1l1.2.1c-1.3-1.9-2.8-3.8-4.4-5.7" style="fill:url(#path3915-7_00000017507385349940871880000003704836091050032289_)"/><linearGradient id="path3915_00000181046024818449407710000014278626011484933562_" x1="107.279" x2="138.077" y1="475.257" y2="501.286" gradientTransform="matrix(3.7795 0 0 -3.7795 -59.395 1916.122)" gradientUnits="userSpaceOnUse"><stop offset="0" style="stop-color:#00a800"/><stop offset="1" style="stop-color:#00e700"/></linearGradient><path id="path3915" d="M454.8 21.3c-13.3 0-26.5 1.8-39.4 5.1-29.4 7.6-58.9 23.3-74.9 50-11.5 19.2-11.4 43.6-2.5 63.7h.1c0 .1.1.2.1.3l.3-.3c2.8-.2 5.6-.5 8.3-.8 29.1-3.1 59.9-11.1 80.7-33 21.4-22.7 30-53.8 35.4-83.7l1.1-1.1c-3.1-.1-6.1-.2-9.2-.2" style="fill:url(#path3915_00000181046024818449407710000014278626011484933562_)"/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 2.5 KiB |
Reference in New Issue
Block a user