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="64" height="64" viewBox="0 0 64 64"><path d="M 32.003143,1.4044602 57.432701,62.632577 6.5672991,62.627924 z" style="fill:#ff0;fill-opacity:.94117647;fill-rule:nonzero;stroke:#000;stroke-width:1.00493038;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/></svg>
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64"><path d="M 32.003143,1.4044602 57.432701,62.632577 6.5672991,62.627924 z" style="fill:#ff0;fill-opacity:.94117647;fill-rule:nonzero;stroke:#000;stroke-width:1.00493038;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/></svg>`