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" version="1.2" viewBox="6.12 1.06 107.77 77.89"><metadata id="metadata167">image/svg+xml</metadata><g class="layer"><title>Layer 1</title><g id="surface710"><path id="path76" fill="#353535" fill-rule="nonzero" d="m111.54707,13.425l-36.39,0c-3.4,0 -6.45,-1.03 -8.76,-2.94l-11.38,-9.43l-27.97,0c-1.65,0 -3.42,1.39 -3.86,3.04l-16.75,70.87l7.57,0l0,3.39l84.1,0c0.94,-0.56 1.75,-1.44 2.02,-2.46l13.65,-59.42c0.45,-1.65 -0.58,-3.05 -2.23,-3.05"/><path id="path78" fill="#33b88f" fill-rule="nonzero" d="m9.15707,78.945c-1.64,0 -3.04,-1.4 -3.04,-3.05l0,-63.33c0,-1.65 1.4,-3.05 3.04,-3.05l27.97,0l13.91,9.44c2.82,1.91 6.14,2.93 9.55,2.93l36.38,0c1.66,0 3.05,1.4 3.05,3.05l0,50.96c0,1.65 -1.39,3.05 -3.05,3.05l-87.81,0zm0,0"/><path id="path80" fill="#353535" fill-rule="nonzero" d="m90.79707,28.795c-1.9,0 -3.43,1.54 -3.43,3.44c0,1.91 1.53,3.45 3.43,3.45c1.91,0 3.45,-1.54 3.45,-3.45c0,-1.9 -1.54,-3.44 -3.45,-3.44"/><path id="path82" fill="#353535" fill-rule="nonzero" d="m79.81707,28.795c-1.91,0 -3.45,1.54 -3.45,3.44c0,1.91 1.54,3.45 3.45,3.45c1.9,0 3.44,-1.54 3.44,-3.45c0,-1.9 -1.54,-3.44 -3.44,-3.44"/><path id="path84" fill="#fff" fill-rule="nonzero" d="m15.09707,57.505l12.73,12.73l12.07,-12.07l12.06,12.07l12.07,-12.06l12.06,12.06l12.06,-12.07l11.89,11.88l0,-12.54l-84.94,0zm0,0"/><path id="path86" fill="#fff" fill-rule="nonzero" d="m41.62707,35.595c0.54,-1.47 0.84,-3.05 0.84,-4.7c0,-7.6 -6.16,-13.75 -13.75,-13.75c-7.6,0 -13.76,6.15 -13.76,13.75c0,1.65 0.31,3.23 0.84,4.7l25.83,0zm0,0"/><path id="path88" fill="#353535" fill-rule="nonzero" d="m34.35707,35.595c1.06,-1.28 1.7,-2.91 1.7,-4.7c0,-1.14 -0.29,-2.2 -0.74,-3.16c-0.26,1.15 -1.25,2.03 -2.48,2.03c-1.41,0 -2.57,-1.15 -2.57,-2.57c0,-1.33 1.01,-2.38 2.29,-2.53c-1.12,-0.69 -2.43,-1.11 -3.84,-1.11c-4.05,0 -7.34,3.29 -7.34,7.34c0,1.79 0.64,3.42 1.7,4.7l11.28,0zm0,0"/></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" version="1.2" viewBox="6.12 1.06 107.77 77.89"><g class="layer"><path fill="#353535" d="M111.547 13.425h-36.39c-3.4 0-6.45-1.03-8.76-2.94l-11.38-9.43h-27.97c-1.65 0-3.42 1.39-3.86 3.04l-16.75 70.87h7.57v3.39h84.1c.94-.56 1.75-1.44 2.02-2.46l13.65-59.42c.45-1.65-.58-3.05-2.23-3.05"/><path fill="#33b88f" d="M9.157 78.945c-1.64 0-3.04-1.4-3.04-3.05v-63.33c0-1.65 1.4-3.05 3.04-3.05h27.97l13.91 9.44c2.82 1.91 6.14 2.93 9.55 2.93h36.38c1.66 0 3.05 1.4 3.05 3.05v50.96c0 1.65-1.39 3.05-3.05 3.05zm0 0"/><path fill="#353535" d="M90.797 28.795c-1.9 0-3.43 1.54-3.43 3.44 0 1.91 1.53 3.45 3.43 3.45 1.91 0 3.45-1.54 3.45-3.45 0-1.9-1.54-3.44-3.45-3.44M79.817 28.795c-1.91 0-3.45 1.54-3.45 3.44 0 1.91 1.54 3.45 3.45 3.45 1.9 0 3.44-1.54 3.44-3.45 0-1.9-1.54-3.44-3.44-3.44"/><path fill="#fff" d="m15.097 57.505 12.73 12.73 12.07-12.07 12.06 12.07 12.07-12.06 12.06 12.06 12.06-12.07 11.89 11.88v-12.54zM41.627 35.595c.54-1.47.84-3.05.84-4.7 0-7.6-6.16-13.75-13.75-13.75-7.6 0-13.76 6.15-13.76 13.75 0 1.65.31 3.23.84 4.7zm0 0"/><path fill="#353535" d="M34.357 35.595a7.33 7.33 0 0 0 1.7-4.7c0-1.14-.29-2.2-.74-3.16-.26 1.15-1.25 2.03-2.48 2.03-1.41 0-2.57-1.15-2.57-2.57 0-1.33 1.01-2.38 2.29-2.53a7.3 7.3 0 0 0-3.84-1.11c-4.05 0-7.34 3.29-7.34 7.34 0 1.79.64 3.42 1.7 4.7zm0 0"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.3 KiB |
Reference in New Issue
Block a user