fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<svg viewBox="0 0 1000 1000" xmlns="http://www.w3.org/2000/svg"><path d="m200.4 39.3h598.1v437.8h161l-460.1 483-460-483.1h161z" stroke="#000" stroke-linejoin="round" stroke-width="74"/><path d="m200.4 39.3h598.1v437.8h161l-460.1 483-460-483h161z" fill="#ffb300" fill-rule="evenodd"/><path d="m499.4 960.2-298.3-920.8h596.7z" fill="#ffca28" fill-rule="evenodd"/><path d="m329.2 843.5h-246.2v-51.8h146.1v-45.9h-146.1v-148.9h246.2v51.5h-146.1v45.9h146.1zm292.2 0h-246.2v-149.2h146.1v-45.9h-146.1v-51.5h246.2zm-146.1-97.8h46v46h-46zm192.1 97.8v-344h100.1v97.4h146.1v246.6zm100.1-195.2h46v143.4h-46z" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="74"/><path d="m329.2 843.5h-246.2v-51.8h146.1v-45.9h-146.1v-148.9h246.2v51.5h-146.1v45.9h146.1zm292.2 0h-246.2v-149.2h146.1v-45.9h-146.1v-51.5h246.2zm-146.1-51.8h46v-46h-46zm192.1 51.9v-344h100.1v97.4h146.1v246.6zm100.1-51.9h46v-143.3h-46z" fill="#fff" fill-rule="evenodd"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><path stroke="#000" stroke-linejoin="round" stroke-width="74" d="M200.4 39.3h598.1v437.8h161l-460.1 483L39.4 477h161z"/><path fill="#ffb300" fill-rule="evenodd" d="M200.4 39.3h598.1v437.8h161l-460.1 483-460-483h161z"/><path fill="#ffca28" fill-rule="evenodd" d="M499.4 960.2 201.1 39.4h596.7z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="74" d="M329.2 843.5H83v-51.8h146.1v-45.9H83V596.9h246.2v51.5H183.1v45.9h146.1zm292.2 0H375.2V694.3h146.1v-45.9H375.2v-51.5h246.2zm-146.1-97.8h46v46h-46zm192.1 97.8v-344h100.1v97.4h146.1v246.6zm100.1-195.2h46v143.4h-46z"/><path fill="#fff" fill-rule="evenodd" d="M329.2 843.5H83v-51.8h146.1v-45.9H83V596.9h246.2v51.5H183.1v45.9h146.1zm292.2 0H375.2V694.3h146.1v-45.9H375.2v-51.5h246.2zm-146.1-51.8h46v-46h-46zm192.1 51.9v-344h100.1V597h146.1v246.6zm100.1-51.9h46V648.4h-46z"/></svg>
|
||||
|
Before Width: | Height: | Size: 951 B After Width: | Height: | Size: 921 B |
Reference in New Issue
Block a user