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,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="logo" x="0px" y="0px" style="enable-background:new 0 0 512 512;" xml:space="preserve" viewBox="3 62.1 505.9 387.8">
-<style type="text/css">
-	.st0{fill:none;stroke:#9AD1ED;stroke-width:35;}
-</style>
-<path class="st0" d="M254.9,79.6c-64.8,0-117.3,52.5-117.5,117.5c0.2,0,0.4,0,0.6,0c67-0.6,117.2,59.6,118.2,108.2  c-1.4-49.5,51.9-107.3,116.2-108.2C372.3,132.2,319.7,79.6,254.9,79.6L254.9,79.6z M372.5,197.1l0,0.3  C291.1,201.1,255.7,269.7,256,305c0.6,67.6-35.3,127-123.8,127.4l241.7-0.9c64.9,0,117.5-51.6,117.5-116.6  c0-65.1-52.6-117.8-117.5-117.8C373.5,197.1,373,197.1,372.5,197.1L372.5,197.1z M255.9,305c-1.7-46.5-45-107.2-118.5-107.6l0-0.3  c-64.7,0.3-116.9,53-116.9,117.8c0,65.1,52,117.8,111.1,117.5C236.4,432,257.6,351.5,255.9,305z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="3 62.1 505.9 387.8"><path d="M254.9 79.6c-64.8 0-117.3 52.5-117.5 117.5h.6c67-.6 117.2 59.6 118.2 108.2-1.4-49.5 51.9-107.3 116.2-108.2-.1-64.9-52.7-117.5-117.5-117.5zm117.6 117.5v.3C291.1 201.1 255.7 269.7 256 305c.6 67.6-35.3 127-123.8 127.4l241.7-.9c64.9 0 117.5-51.6 117.5-116.6 0-65.1-52.6-117.8-117.5-117.8h-1.4zM255.9 305c-1.7-46.5-45-107.2-118.5-107.6v-.3c-64.7.3-116.9 53-116.9 117.8 0 65.1 52 117.8 111.1 117.5 104.8-.4 126-80.9 124.3-127.4z" style="fill:none;stroke:#9ad1ed;stroke-width:35"/></svg>