fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 99.21 99.98"><defs><style>.b{fill:#e1231b;}</style></defs><g><path class="b" d="M66.35,25.4c-4.77-.57-9.57-3.54-14.87-3.55-3.87,0-6,1.89-9.02,3.37,1.06-2.41,1.52-5.89,3.34-8.17,.58-.73,1.66-1.24,2.51-2.13,1.07-1.13,1.82-3.55,3.67-3.55,1.97,0,3.35,3.59,4.51,4.79,2.95,3.08,8.34,4.75,9.85,9.23"/><path class="b" d="M30.77,40.32h.33c1.02,.44,1.12,1.45,2.17,2.13,2.41,1.56,6.25,1.54,5.34,6.04-1.48-1-3.34-.97-4.68-1.95-1.79-1.31-2.57-3.62-3.17-6.21"/><path class="b" d="M39.63,66.59c2.26,1.18,5.75,.92,8.69,.53v3.02c4.61-1.36,6.28-7.04,8.35-11.01,1.63-3.12,3.21-5.76,5.35-8.34,4.5-5.44,8.6-8.06,16.87-10.29h.33c-5.41,4.25-11.26,7.52-16.37,13.85-4.77,5.91-7.66,13.28-13.2,17.22-3.5,2.49-12.15,2.59-10.02-4.97"/><path class="b" d="M33.61,25.94c-.67,1.36-2.43,1.58-4.01,1.6-6.6,.09-11.8-4.75-18.21-5.33,3.08-5.48,9.31-8.87,14.36-12.78C35.94,1.56,56.77-4.18,71.19,3.92,56.16-.46,36.33,4.98,27.77,14.4c-1.2,1.31-3.26,3.33-3.17,5.15,.16,3.54,6.6,4.95,9.02,6.39"/><path class="b" d="M58.83,38.72c.88,.12-.1,.94-.33,1.95-.35,1.52-.15,3.24-.5,3.91-1.35,2.58-5.77,1.97-8.18,3.37,.4-5.85,6.27-5.88,9.02-9.23"/></g><g><path class="b" d="M4.45,94.01l-.03,.1h0l.03-.1c-1.25-.38-2.23-.68-2.23-1.66,0-.66,.71-1.07,1.85-1.07,.87,0,1.83,.29,2.56,.78,.05,.04,.11,.05,.18,.03,.06-.02,.11-.06,.14-.12l.47-1.04c.04-.1,.01-.21-.08-.27-.88-.59-2.08-.94-3.21-.94-1.04,0-1.93,.25-2.57,.73-.66,.49-1.02,1.19-1.02,2.01,0,2.04,1.71,2.55,3.21,3,1.26,.38,2.26,.67,2.26,1.69,0,.79-.79,1.28-2.06,1.28-1.07,0-2.25-.5-3.09-1.32-.04-.04-.1-.06-.15-.06h-.04c-.07,.01-.13,.06-.16,.12l-.5,1c-.04,.09-.02,.19,.04,.26,1.02,.97,2.47,1.55,3.88,1.55,2.24,0,3.74-1.16,3.74-2.89,0-2.08-1.72-2.61-3.24-3.07Z"/><path class="b" d="M21.83,89.75h-1.36c-.08,0-.16,.05-.2,.12l-3.35,6.63-3.37-6.63c-.04-.07-.11-.12-.2-.12h-1.38c-.12,0-.22,.1-.22,.22v9.74c0,.12,.1,.22,.22,.22h1.06c.12,0,.22-.1,.22-.22v-7.11l3.12,6.18c.04,.07,.11,.12,.2,.12h.67c.08,0,.16-.05,.2-.12l3.13-6.18v7.11c.01,.12,.11,.22,.23,.22h1.03c.12,0,.22-.1,.22-.22v-9.74c0-.12-.1-.22-.22-.22Z"/><path class="b" d="M31.32,89.88c-.04-.08-.11-.13-.2-.13h-1.15c-.09,0-.16,.05-.2,.13l-4.37,9.74c-.03,.07-.02,.15,.02,.21,.04,.06,.11,.1,.18,.1h1.18c.09,0,.17-.05,.2-.13l1.03-2.33h5.03l1.03,2.33c.03,.08,.11,.13,.2,.13h1.21c.07,0,.14-.04,.18-.1,.04-.06,.05-.14,.02-.21l-4.35-9.74Zm1.05,6.08h-3.7l1.84-4.18,1.86,4.18Z"/><path class="b" d="M45.37,96.51c1.35-.54,2.06-1.67,2.06-3.27,0-1.08-.37-1.98-1.08-2.58-.71-.6-1.71-.91-2.98-.91h-3.7c-.12,0-.22,.1-.22,.22v9.74c0,.12,.1,.22,.22,.22h1.11c.12,0,.22-.1,.22-.22v-2.86h2.37c.18,0,.35,0,.54-.02l1.95,2.99c.04,.06,.11,.1,.18,.1h1.27c.08,0,.16-.04,.19-.12s.03-.16-.01-.23l-2.12-3.08Zm.55-3.24c0,1.72-1.39,2.08-2.55,2.08h-2.37v-4.08h2.37c1.16,0,2.55,.35,2.55,2.01Z"/><path class="b" d="M58.1,89.75h-7.47c-.12,0-.22,.1-.22,.22v1.07c0,.12,.1,.22,.22,.22h2.95v8.45c0,.12,.1,.22,.22,.22h1.11c.12,0,.22-.1,.22-.22v-8.45h2.97c.12,0,.22-.1,.22-.22v-1.07c0-.12-.1-.22-.22-.22Z"/><path class="b" d="M68.13,89.75h-6.19c-.12,0-.22,.1-.22,.22v9.74c0,.12,.1,.22,.22,.22h1.11c.12,0,.22-.1,.22-.22v-3.95h4.33c.12,0,.22-.1,.22-.22v-1.07c0-.12-.1-.22-.22-.22h-4.33v-2.98h4.86c.12,0,.22-.1,.22-.22v-1.07c0-.12-.1-.22-.22-.22Z"/><path class="b" d="M76.19,89.72c-2.99,0-5.33,2.25-5.33,5.12,0,1.39,.55,2.68,1.55,3.65,1,.97,2.34,1.5,3.78,1.5s2.77-.53,3.76-1.5c1-.97,1.55-2.26,1.55-3.65s-.55-2.68-1.55-3.64c-.99-.96-2.33-1.48-3.76-1.48Zm3.73,5.12c0,2-1.67,3.63-3.73,3.63s-3.76-1.63-3.76-3.63,1.69-3.62,3.76-3.62,3.73,1.62,3.73,3.62Z"/><path class="b" d="M92.65,99.58l-3.5-4.94,3.22-4.55c.05-.07,.05-.15,.02-.23-.04-.07-.11-.12-.19-.12h-1.31c-.07,0-.14,.03-.18,.09l-2.53,3.51-2.51-3.51c-.04-.06-.11-.09-.18-.09h-1.31c-.08,0-.16,.04-.2,.12-.04,.07-.03,.16,.02,.23l3.24,4.6-3.49,4.88c-.05,.07-.05,.15-.02,.23,.04,.07,.11,.12,.19,.12h1.31c.07,0,.14-.03,.18-.09l2.76-3.83,2.79,3.83c.04,.06,.11,.09,.18,.09h1.34c.08,0,.16-.05,.2-.12,.04-.07,.03-.16-.02-.23Z"/></g><path class="b" d="M97.39,92.71c.32-.14,.5-.41,.5-.78,0-.55-.4-.89-1.05-.89h-.99v2.5h.45v-.73h.54s.08,0,.12,0l.5,.71,.02,.02h.5l-.06-.08-.53-.75Zm-.56-.29h-.53v-.97h.53c.28,0,.61,.08,.61,.48s-.33,.49-.61,.49Z"/><path class="b" d="M96.74,89.82c-1.36,0-2.47,1.11-2.47,2.47s1.11,2.47,2.47,2.47,2.47-1.11,2.47-2.47-1.11-2.47-2.47-2.47Zm0,4.56c-1.15,0-2.08-.93-2.08-2.08s.93-2.08,2.08-2.08,2.08,.93,2.08,2.08-.93,2.08-2.08,2.08Z"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" id="a" viewBox="0 0 99.21 99.98"><defs><style>.b{fill:#e1231b}</style></defs><path d="M66.35 25.4c-4.77-.57-9.57-3.54-14.87-3.55-3.87 0-6 1.89-9.02 3.37 1.06-2.41 1.52-5.89 3.34-8.17.58-.73 1.66-1.24 2.51-2.13 1.07-1.13 1.82-3.55 3.67-3.55 1.97 0 3.35 3.59 4.51 4.79 2.95 3.08 8.34 4.75 9.85 9.23M30.77 40.32h.33c1.02.44 1.12 1.45 2.17 2.13 2.41 1.56 6.25 1.54 5.34 6.04-1.48-1-3.34-.97-4.68-1.95-1.79-1.31-2.57-3.62-3.17-6.21M39.63 66.59c2.26 1.18 5.75.92 8.69.53v3.02c4.61-1.36 6.28-7.04 8.35-11.01 1.63-3.12 3.21-5.76 5.35-8.34 4.5-5.44 8.6-8.06 16.87-10.29h.33c-5.41 4.25-11.26 7.52-16.37 13.85-4.77 5.91-7.66 13.28-13.2 17.22-3.5 2.49-12.15 2.59-10.02-4.97" class="b"/><path d="M33.61 25.94c-.67 1.36-2.43 1.58-4.01 1.6-6.6.09-11.8-4.75-18.21-5.33 3.08-5.48 9.31-8.87 14.36-12.78C35.94 1.56 56.77-4.18 71.19 3.92 56.16-.46 36.33 4.98 27.77 14.4c-1.2 1.31-3.26 3.33-3.17 5.15.16 3.54 6.6 4.95 9.02 6.39M58.83 38.72c.88.12-.1.94-.33 1.95-.35 1.52-.15 3.24-.5 3.91-1.35 2.58-5.77 1.97-8.18 3.37.4-5.85 6.27-5.88 9.02-9.23M4.45 94.01l-.03.1zc-1.25-.38-2.23-.68-2.23-1.66 0-.66.71-1.07 1.85-1.07.87 0 1.83.29 2.56.78q.075.06.18.03c.06-.02.11-.06.14-.12l.47-1.04a.22.22 0 0 0-.08-.27c-.88-.59-2.08-.94-3.21-.94-1.04 0-1.93.25-2.57.73-.66.49-1.02 1.19-1.02 2.01 0 2.04 1.71 2.55 3.21 3 1.26.38 2.26.67 2.26 1.69 0 .79-.79 1.28-2.06 1.28-1.07 0-2.25-.5-3.09-1.32a.22.22 0 0 0-.15-.06H.67a.22.22 0 0 0-.16.12l-.5 1c-.04.09-.02.19.04.26 1.02.97 2.47 1.55 3.88 1.55 2.24 0 3.74-1.16 3.74-2.89 0-2.08-1.72-2.61-3.24-3.07ZM21.83 89.75h-1.36a.24.24 0 0 0-.2.12l-3.35 6.63-3.37-6.63a.23.23 0 0 0-.2-.12h-1.38c-.12 0-.22.1-.22.22v9.74c0 .12.1.22.22.22h1.06c.12 0 .22-.1.22-.22V92.6l3.12 6.18c.04.07.11.12.2.12h.67c.08 0 .16-.05.2-.12l3.13-6.18v7.11c.01.12.11.22.23.22h1.03c.12 0 .22-.1.22-.22v-9.74c0-.12-.1-.22-.22-.22M31.32 89.88a.22.22 0 0 0-.2-.13h-1.15c-.09 0-.16.05-.2.13l-4.37 9.74a.223.223 0 0 0 .2.31h1.18c.09 0 .17-.05.2-.13l1.03-2.33h5.03l1.03 2.33c.03.08.11.13.2.13h1.21a.223.223 0 0 0 .2-.31l-4.35-9.74Zm1.05 6.08h-3.7l1.84-4.18zM45.37 96.51c1.35-.54 2.06-1.67 2.06-3.27 0-1.08-.37-1.98-1.08-2.58s-1.71-.91-2.98-.91h-3.7c-.12 0-.22.1-.22.22v9.74c0 .12.1.22.22.22h1.11c.12 0 .22-.1.22-.22v-2.86h2.37c.18 0 .35 0 .54-.02l1.95 2.99c.04.06.11.1.18.1h1.27c.08 0 .16-.04.19-.12s.03-.16-.01-.23l-2.12-3.08Zm.55-3.24c0 1.72-1.39 2.08-2.55 2.08H41v-4.08h2.37c1.16 0 2.55.35 2.55 2.01ZM58.1 89.75h-7.47c-.12 0-.22.1-.22.22v1.07c0 .12.1.22.22.22h2.95v8.45c0 .12.1.22.22.22h1.11c.12 0 .22-.1.22-.22v-8.45h2.97c.12 0 .22-.1.22-.22v-1.07c0-.12-.1-.22-.22-.22M68.13 89.75h-6.19c-.12 0-.22.1-.22.22v9.74c0 .12.1.22.22.22h1.11c.12 0 .22-.1.22-.22v-3.95h4.33c.12 0 .22-.1.22-.22v-1.07c0-.12-.1-.22-.22-.22h-4.33v-2.98h4.86c.12 0 .22-.1.22-.22v-1.07c0-.12-.1-.22-.22-.22ZM76.19 89.72c-2.99 0-5.33 2.25-5.33 5.12 0 1.39.55 2.68 1.55 3.65s2.34 1.5 3.78 1.5 2.77-.53 3.76-1.5c1-.97 1.55-2.26 1.55-3.65s-.55-2.68-1.55-3.64c-.99-.96-2.33-1.48-3.76-1.48m3.73 5.12c0 2-1.67 3.63-3.73 3.63s-3.76-1.63-3.76-3.63 1.69-3.62 3.76-3.62 3.73 1.62 3.73 3.62M92.65 99.58l-3.5-4.94 3.22-4.55c.05-.07.05-.15.02-.23a.22.22 0 0 0-.19-.12h-1.31c-.07 0-.14.03-.18.09l-2.53 3.51-2.51-3.51a.21.21 0 0 0-.18-.09h-1.31a.22.22 0 0 0-.2.12c-.04.07-.03.16.02.23l3.24 4.6-3.49 4.88c-.05.07-.05.15-.02.23.04.07.11.12.19.12h1.31c.07 0 .14-.03.18-.09L88.17 96l2.79 3.83c.04.06.11.09.18.09h1.34c.08 0 .16-.05.2-.12s.03-.16-.02-.23ZM97.39 92.71c.32-.14.5-.41.5-.78 0-.55-.4-.89-1.05-.89h-.99v2.5h.45v-.73h.66l.5.71.02.02h.5l-.06-.08zm-.56-.29h-.53v-.97h.53c.28 0 .61.08.61.48s-.33.49-.61.49" class="b"/><path d="M96.74 89.82c-1.36 0-2.47 1.11-2.47 2.47s1.11 2.47 2.47 2.47 2.47-1.11 2.47-2.47-1.11-2.47-2.47-2.47m0 4.56c-1.15 0-2.08-.93-2.08-2.08s.93-2.08 2.08-2.08 2.08.93 2.08 2.08-.93 2.08-2.08 2.08" class="b"/></svg>
|
||||
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 3.7 KiB |
Reference in New Issue
Block a user