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,7 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" viewBox="41 0.35 430 511.65">
-    <title>Akkoma logo [2 color]</title>
-    <g id="Akkoma-logo-[2-color]" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M139.745544,182.246317 C197.896253,184.96565 240.314405,190.883545 267,200 C289.788483,207.785106 348.274842,246.332973 351.097209,252.530479 C351.317421,253.014033 351.649429,253.767043 352.093231,254.789508 C389.105083,345.293142 400.303077,418.463506 385.687211,474.300598 C369.894271,534.634475 305.755298,511.365393 282.042938,472.502849 C261.412687,438.691622 253.03984,383.629072 241.486159,385.534009 C214.979181,389.904403 178.820676,522.020668 85.3280018,511.391657 C37.2604127,505.926942 36.3687331,438.648242 45.5303242,382.126986 C59.2497363,297.486843 90.6548096,230.859953 139.745544,182.246317 Z M211.977634,210 C174.508806,221.388029 155.850204,245.958286 156.001826,283.710772 C156.100749,308.34176 196.952553,318.492367 226.830028,313.943376 C287.074261,304.7709 275.693658,272.728314 267.01209,251.289387 C264.299625,244.591019 257.405713,235.040243 246.330353,222.637057 L211.977634,210 Z" id="Akkoma" fill="#58408C"/>
-        <path d="M256,226 C372,262 471,280.501539 471,262 C471,246.6558 458.619297,209.991395 349.432923,154.571128 C350.223779,128.108061 351.079471,111.917685 352,106 C359,61 396,15 382,2 C368,-11 275,56 236,88 C229.634794,93.2227334 217.993323,100.771865 201.075587,110.647394 C117.71034,102.986822 68.8355347,105.340035 56,127 C49,142 140,190 256,226 Z" id="Oval" fill="#ffffff"/>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="41 0.35 430 511.65"><g fill="none" fill-rule="evenodd"><path fill="#58408C" d="M139.746 182.246Q226.97 186.326 267 200c22.788 7.785 81.275 46.333 84.097 52.53q.33.726.996 2.26 55.518 135.755 33.594 219.51c-15.793 60.334-79.932 37.065-103.644-1.797-20.63-33.811-29.003-88.874-40.557-86.969-26.507 4.37-62.665 136.487-156.158 125.858-48.068-5.465-48.96-72.744-39.798-129.265q20.58-126.96 94.216-199.88M211.978 210q-56.205 17.082-55.976 73.71c.099 24.632 40.95 34.782 70.828 30.233 60.244-9.172 48.864-41.215 40.182-62.654q-4.068-10.047-20.682-28.652z"/><path fill="#fff" d="M256 226c116 36 215 54.502 215 36 0-15.344-12.38-52.009-121.567-107.429Q350.618 114.877 352 106c7-45 44-91 30-104S275 56 236 88q-9.548 7.835-34.924 22.647C117.71 102.987 68.836 105.34 56 127c-7 15 84 63 200 99"/></g></svg>