fix: resolve merge conflicts

2025-01-05 02:54:50 +00:00
parent b560a099e9
commit 1dde587869
4944 changed files with 1635 additions and 73999 deletions
@@ -1,9 +1 @@
-<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="svg3430" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="44.37 -0.06 423.3 512.1">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;}
-</style>
-<g id="g2917" transform="translate(-556.63486,-698.76242)">
-	<path id="path2919" class="st0" d="M905.7,698.8c-5-0.1-9.8,3-11.8,7.5c-1.9,4.5-0.8,10.1,2.7,13.5L1003,826.4   c3.4,3.4,9,4.6,13.5,2.8s7.7-6.5,7.8-11.3V711.1c0-6.4-5.9-12.3-12.5-12.3H905.7z"/>
-	<path id="path2923" class="st0" d="M613.4,698.8c-6.9,0.1-12.4,5.7-12.4,12.6v486.8c0,6.9,5.5,12.5,12.4,12.6h398.3   c7,0,12.6-5.6,12.6-12.6l0,0V884.7c0-3.4-1.3-6.6-3.7-9L848.3,702.6c-2.3-2.4-5.6-3.8-9-3.9H613.4V698.8z M626,724h208.1l165,165.8   v295.8H626V724z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" id="svg3430" x="0" y="0" version="1.1" viewBox="44.37 -0.06 423.3 512.1"><style>.st0{fill-rule:evenodd;clip-rule:evenodd}</style><g id="g2917" transform="translate(-556.635 -698.762)"><path id="path2919" d="M905.7 698.8c-5-.1-9.8 3-11.8 7.5-1.9 4.5-.8 10.1 2.7 13.5L1003 826.4c3.4 3.4 9 4.6 13.5 2.8s7.7-6.5 7.8-11.3V711.1c0-6.4-5.9-12.3-12.5-12.3z" class="st0"/><path id="path2923" d="M613.4 698.8c-6.9.1-12.4 5.7-12.4 12.6v486.8c0 6.9 5.5 12.5 12.4 12.6h398.3c7 0 12.6-5.6 12.6-12.6V884.7c0-3.4-1.3-6.6-3.7-9L848.3 702.6c-2.3-2.4-5.6-3.8-9-3.9H613.4zM626 724h208.1l165 165.8v295.8H626z" class="st0"/></g></svg>