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="Layer_1" xmlns="http://www.w3.org/2000/svg" width="122.09" height="125.51" viewBox="0 0 122.09 125.51"><path d="M112.31,38.41c-4.88.42-8.5,4.6-8.08,9.47,0,.7.28,1.39.42,2.09l-35.66,8.78c-.56-3.48-2.09-6.83-4.46-9.75-1.95-2.37-4.18-4.18-6.83-5.43l10.45-21.73c3.48,1.11,7.38.42,10.45-1.95,4.74-3.9,5.57-11,1.67-15.74-3.9-4.74-11-5.57-15.74-1.67-4.74,3.9-5.57,11-1.67,15.74,1.11,1.25,2.37,2.23,3.76,2.93l-10.45,21.73c-7.1-3.06-15.6-2.09-22.01,3.06-.7.56-1.39,1.25-1.95,1.81l-11.56-9.47c.98-1.81,1.11-3.9,0-5.85-1.53-3.2-5.43-4.46-8.64-2.93-3.2,1.53-4.46,5.43-2.93,8.64s5.43,4.46,8.64,2.93c.7-.42,1.39-.84,1.81-1.39l11.42,9.33c-6.41,7.8-6.55,19.08,0,27.16,1.53,1.95,3.34,3.48,5.29,4.6l-13.09,18.81c-2.65-2.09-6.13-3.2-9.75-2.93-7.94.56-13.93,7.52-13.37,15.46.56,7.94,7.52,13.93,15.6,13.37,7.94-.56,13.93-7.52,13.37-15.6-.28-3.76-1.95-6.96-4.46-9.33l13.37-19.08c6.27,3.34,14.07,3.2,20.48-.28l7.52,12.54c-.98.7-1.67,1.81-1.81,3.2-.28,2.51,1.53,4.74,3.9,5.01,2.51.28,4.74-1.53,5.01-3.9.28-2.51-1.53-4.74-3.9-5.01h-1.67l-7.52-12.68c.56-.42,1.11-.84,1.67-1.25,5.85-4.74,8.5-11.98,7.8-18.94l36.22-8.92c1.67,2.93,4.74,4.74,8.36,4.46,4.88-.42,8.5-4.6,8.08-9.47-.42-4.88-4.6-8.5-9.47-8.08" style="fill:#fefefe;"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="Layer_1" x="0" y="0" style="enable-background:new 0 0 512 512" version="1.1" viewBox="0 0 512 512"><style>.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#f7f5f6}</style><path d="M207.1 262.7 79.6 445.1m127.5-182.4 264-65.1m-259.2 70.6 73.9 123.5M180.4 232.2l-108.5-89m150.5 69.3 63.8-132.8" class="st0"/><g transform="translate(0 23.6)"><defs><filter id="Adobe_OpacityMaskFilter" width="116.3" height="116.3" x="11.9" y="368.7" fill="#000" filterUnits="userSpaceOnUse"><feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 1 0"/></filter></defs><mask id="f_00000029767045488701418600000006495648659421629069_" width="116.3" height="116.3" x="11.9" y="368.7" fill="#000" maskUnits="userSpaceOnUse"><g style="filter:url(#Adobe_OpacityMaskFilter)"><path id="e_00000075162388066800093230000009666806801934994345_" d="M11.9 368.8v116.4h116.3V368.8z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#fff"/></g></mask><path d="M12 431.3c-2.4-32 21.6-60 53.6-62.4s60 21.6 62.4 53.6-21.6 60-53.6 62.4-60-21.6-62.4-53.6" style="mask:url(#f_00000029767045488701418600000006495648659421629069_);fill-rule:evenodd;clip-rule:evenodd;fill:#f7f5f6"/></g><path d="M267.9 393.9c1.1-9.9 10.1-17 20-15.9 9.9 1.2 17 10.1 15.9 20-1.2 9.9-10.1 17.1-20 15.9s-17.1-10.1-15.9-20.2M48.7 157c-6.3-12.8-1-28.2 11.8-34.6 12.8-6.3 28.2-1 34.6 11.8 6.2 12.8 1 28.2-11.8 34.6s-28.2 1-34.6-11.8m380.8 38.8c-1.5-19.5 13.1-36.5 32.6-37.9 19.5-1.5 36.5 13.1 37.9 32.6 1.5 19.5-13.1 36.5-32.6 37.9-19.5 1.5-36.5-13-37.9-32.6M269.8 13.4C289-2.2 317.3.7 333 19.9s12.8 47.5-6.4 63.2c-19.2 15.6-47.5 12.8-63.2-6.5-15.8-19.2-12.9-47.5 6.4-63.2M148.2 187.8c37-30.1 91.4-24.6 121.4 12.4 30.1 37 24.5 91.4-12.4 121.4-37 30.1-91.4 24.6-121.4-12.4-30.2-36.9-24.6-91.3 12.4-121.4" class="st0"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.8 KiB |
Reference in New Issue
Block a user