fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1,14 +1 @@
|
||||
<svg 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/" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="svg4485" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="95.85 -0.03 320.31 512.05">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FBA457;}
|
||||
</style>
|
||||
<sodipodi:namedview bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" id="namedview4487" inkscape:current-layer="g4612" inkscape:cx="305.99333" inkscape:cy="304.30809" inkscape:document-rotation="0" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="1410" inkscape:window-maximized="0" inkscape:window-width="1274" inkscape:window-x="1280" inkscape:window-y="22" inkscape:zoom="1.2636719" objecttolerance="10" pagecolor="#ffffff" showgrid="false">
|
||||
</sodipodi:namedview>
|
||||
<g id="g4612">
|
||||
<g id="g850" transform="matrix(0.99659595,0,0,0.99659595,0.37313949,0.87143746)">
|
||||
<path id="path4497" class="st0" d="M135.8-0.9c-22.1,0-40,17.9-40,40c0,0,0,0,0,0v473.8h127.7V-0.9L135.8-0.9z"/>
|
||||
<path id="path4516" class="st0" d="M288-0.9V256h89.2c22.1,0,40-17.9,40-40V-0.9H288z"/>
|
||||
<path id="path4516-5" class="st0" d="M288,385.2v127.7h89.2c22.1,0,40-17.9,40-40l0,0v-87.7H288z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="svg4485" x="0" y="0" version="1.1" viewBox="95.85 -0.03 320.31 512.05"><style>.st0{fill:#fba457}</style><g id="g4612"><g id="g850" transform="matrix(.9966 0 0 .9966 .373 .871)"><path id="path4497" d="M135.8-.9c-22.1 0-40 17.9-40 40v473.8h127.7V-.9z" class="st0"/><path id="path4516" d="M288-.9V256h89.2c22.1 0 40-17.9 40-40V-.9z" class="st0"/><path id="path4516-5" d="M288 385.2v127.7h89.2c22.1 0 40-17.9 40-40v-87.7z" class="st0"/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 511 B |
Reference in New Issue
Block a user