Resolve conflicts using files from Stirling-2.0

2026-09-14 12:42:08 +02:00 · 2025-06-24 12:51:39 +01:00
parent 16e56e3208
commit a51960b199
691 changed files with 168291 additions and 0 deletions
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40"><rect id="rect4" width="36.075" height="31.097" x="1.962" y="4.452" style="fill:#ff0;fill-opacity:1;fill-rule:evenodd;stroke:#000;stroke-width:1.23004246;stroke-opacity:1"/><rect id="rect6" width="27.969" height="1.501" x="6.016" y="10.285" style="fill:#000;fill-opacity:1;stroke:none"/><rect id="rect8" width="27.969" height=".858" x="6.016" y="23.217" style="fill:#000;fill-opacity:1;stroke:none"/><rect id="rect10" width="27.969" height=".858" x="5.813" y="28.964" style="fill:#000;fill-opacity:1;stroke:none"/><rect id="rect12" width="27.969" height=".858" x="6.016" y="17.426" style="fill:#000;fill-opacity:1;stroke:none"/></svg>
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" viewBox="0 0 40 40"><rect id="rect4" width="36.075" height="31.097" x="1.962" y="4.452" style="fill:#ff0;fill-opacity:1;fill-rule:evenodd;stroke:#000;stroke-width:1.23004246;stroke-opacity:1"/><rect id="rect6" width="27.969" height="1.501" x="6.016" y="10.285" style="fill:#000;fill-opacity:1;stroke:none"/><rect id="rect8" width="27.969" height=".858" x="6.016" y="23.217" style="fill:#000;fill-opacity:1;stroke:none"/><rect id="rect10" width="27.969" height=".858" x="5.813" y="28.964" style="fill:#000;fill-opacity:1;stroke:none"/><rect id="rect12" width="27.969" height=".858" x="6.016" y="17.426" style="fill:#000;fill-opacity:1;stroke:none"/></svg>