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 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg4044" width="768" height="768" version="1.1" viewBox="-18.262 -18.262 645.275 645.275"><path id="path3958" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 608.75,0 0,608.75 L 0,608.75 0,0 Z"/><path id="path3960" style="fill:#e10915;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 24.11125,584.6375 560.5275,0 0,-560.53125 -560.5275,0 0,560.53125 z m 536.42125,-24.10625 -512.315,0 0,-512.31375 512.315,0 0,512.31375 z"/><path id="path3962" d="m 198.89648,126.57172 0,102.46094 102.46094,0 0,-102.46094 -102.46094,0 z m 120.54688,0 0,102.46094 102.46094,-102.46094 -102.46094,0 z m -120.54688,120.54297 0,102.46093 102.46094,0 0,-102.46093 -102.46094,0 z m 120.54688,0 0,102.46093 102.46094,0 -102.46094,-102.46093 z" style="fill:#e10915;fill-opacity:1;fill-rule:nonzero;stroke:none"/><path id="path3970" d="m 299.93164,408.09516 c -0.56704,10e-4 -1.1368,0.0232 -1.70508,0.0684 -5.3075,-0.38125 -10.51117,1.59554 -14.23242,5.40429 -3.715,3.80875 -5.56719,9.06383 -5.05469,14.36133 l 0,6.03125 -7.17187,0 0,11.6875 7.17187,0 0,36.5293 14.46485,0 0,-36.94922 16.45508,0 0,-11.63086 -16.45508,0 0,-4.46289 c 0,-6.025 2.83578,-9.16016 7.89453,-9.16016 l 0.0644,-0.0586 c 2.685,-0.0688 5.3268,0.66508 7.5918,2.11133 l 2.28906,-10.84961 c -3.43547,-2.02891 -7.34325,-3.09041 -11.3125,-3.08203 z m -203.49609,1.08789 0,72.99414 16.39648,0 0,-32.85157 23.92578,32.85157 18.98438,0 -28.14453,-37.31055 27.72461,-35.68359 -18.56446,0 -23.92578,33.45312 0,-33.45312 -16.39648,0 z m 221.62109,0 0,72.99023 14.4668,0 0,-72.99023 -14.4668,0 z m 180.21484,0 0,30.13867 c -4.01875,-4.21875 -9.59843,-6.59836 -15.42968,-6.56836 -13.68125,0 -22.96485,11.26914 -22.96485,25.55664 -0.4825,6.42625 1.70969,12.76414 6.05469,17.52539 4.34625,4.755 10.46516,7.50797 16.91016,7.60547 5.835,0.0738 11.43593,-2.30781 15.42968,-6.57031 l 0,5.30664 14.04297,0 0,-72.99414 -14.04297,0 z m -63.94531,23.25781 c -0.32153,-0.005 -0.64367,-0.002 -0.96679,0.01 l 0,0.0586 c -5.89376,-0.0387 -11.51844,2.46625 -15.42969,6.875 l 0,-6.03125 -14.10547,0 0,48.82422 14.16406,0 0,-31.88477 c 2.33375,-3.47125 6.24508,-5.55062 10.42383,-5.54687 2.68125,-0.15125 5.28922,0.9025 7.10547,2.875 1.82125,1.9725 2.66703,4.65429 2.30078,7.31054 l 0,27.2461 14.22266,0 0,-30.13672 c 0.43375,-5.15625 -1.3629,-10.255 -4.93164,-14 -3.35157,-3.51094 -7.9603,-5.51874 -12.78321,-5.59961 z m -257.66601,0.18945 c -13.56375,0 -22.9043,11.27039 -22.9043,25.55664 -0.48375,6.41625 1.69695,12.75086 6.0332,17.50586 4.33125,4.75125 10.4361,7.51446 16.8711,7.62696 5.56625,0.0725 10.93281,-2.10039 14.88281,-6.02539 l 0,4.88281 14.10742,0 0,-48.58008 -14.10742,0 0,5.06445 c -3.98875,-3.86625 -9.32656,-6.03125 -14.88281,-6.03125 z m 187.80664,0 c -13.56375,0 -22.9043,11.27039 -22.9043,25.55664 -0.48375,6.41625 1.69891,12.75086 6.03516,17.50586 4.33625,4.75125 10.43414,7.51446 16.86914,7.62696 5.57125,0.0725 10.93367,-2.10039 14.88867,-6.02539 l 0,4.88281 14.10156,0 0,-48.58008 -14.10156,0 0,5.06445 c -3.99375,-3.86625 -9.33117,-6.03125 -14.88867,-6.03125 z m -148.8125,0.9668 0,30.13867 c -0.43375,5.15625 1.36164,10.25305 4.93164,13.99805 3.57375,3.745 8.57961,5.77594 13.75586,5.58594 5.97125,-0.0388 11.63867,-2.65063 15.54492,-7.17188 l 0,6.0293 14.10742,0 0,-48.58008 -14.10742,0 0,31.88086 c -2.4025,3.39875 -6.26758,5.45437 -10.42383,5.54687 -2.675,0.12625 -5.2725,-0.93273 -7.09375,-2.89648 -1.82625,-1.9625 -2.69164,-4.62781 -2.36914,-7.28906 l 0,-27.24219 -14.3457,0 z m -34.41407,10.8457 c 3.93625,-0.0287 7.69149,1.64024 10.30274,4.58399 l 0,17.53906 c -2.6075,2.95 -6.36649,4.62078 -10.30274,4.58203 -7.02625,-0.47375 -12.48437,-6.30836 -12.48437,-13.34961 0,-7.04125 5.45812,-12.88172 12.48437,-13.35547 z m 187.80665,0 c 3.93624,-0.0287 7.69734,1.64024 10.30859,4.58399 l 0,17.53906 c -2.6075,2.95 -6.37235,4.62078 -10.30859,4.58203 -7.02626,-0.47375 -12.48438,-6.30836 -12.48438,-13.34961 0,-7.04125 5.45813,-12.88172 12.48438,-13.35547 z m 118.375,0.0625 c 4.2275,-0.0587 8.2371,1.86039 10.8496,5.18164 l 0,16.33789 c -2.6125,3.32 -6.6221,5.23844 -10.8496,5.17969 -7.02751,-0.4725 -12.48633,-6.30641 -12.48633,-13.34765 0,-7.04125 5.45883,-12.87782 12.48633,-13.35157 z" style="fill:#e10915;fill-opacity:1;fill-rule:nonzero;stroke:none"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="768" height="768" viewBox="-18.262 -18.262 645.275 645.275"><path d="M0 0h608.75v608.75H0z" style="fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none"/><path d="M24.111 584.638H584.64V24.106H24.11zm536.422-24.107H48.217V48.218h512.316z" style="fill:#e10915;fill-opacity:1;fill-rule:nonzero;stroke:none"/><path d="M198.896 126.572v102.46h102.461v-102.46zm120.547 0v102.46l102.461-102.46zM198.896 247.115v102.46h102.461v-102.46zm120.547 0v102.46h102.461zM299.932 408.095q-.852 0-1.705.069a18.08 18.08 0 0 0-14.233 5.404 18.08 18.08 0 0 0-5.055 14.361v6.031h-7.171v11.688h7.171v36.53h14.465v-36.95h16.455v-11.63h-16.455v-4.464c0-6.025 2.836-9.16 7.895-9.16l.064-.058a13.46 13.46 0 0 1 7.592 2.11l2.29-10.849a22.15 22.15 0 0 0-11.313-3.082m-203.496 1.088v72.994h16.396v-32.851l23.926 32.851h18.984l-28.144-37.31 27.724-35.684h-18.564l-23.926 33.453v-33.453zm221.62 0v72.99h14.467v-72.99zm180.215 0v30.139a21.16 21.16 0 0 0-15.43-6.569c-13.68 0-22.964 11.27-22.964 25.557a23.4 23.4 0 0 0 6.055 17.525 23.4 23.4 0 0 0 16.91 7.606 20.78 20.78 0 0 0 15.43-6.57v5.306h14.042v-72.994zm-63.945 23.258a18 18 0 0 0-.967.01v.058a20.45 20.45 0 0 0-15.43 6.875v-6.03h-14.105v48.823h14.164v-31.884a12.55 12.55 0 0 1 10.424-5.547 8.97 8.97 0 0 1 7.106 2.875 8.97 8.97 0 0 1 2.3 7.31v27.246h14.223v-30.136a18.1 18.1 0 0 0-4.932-14 18.1 18.1 0 0 0-12.783-5.6zm-257.666.19c-13.564 0-22.904 11.27-22.904 25.556a23.37 23.37 0 0 0 6.033 17.506 23.4 23.4 0 0 0 16.871 7.627 20.74 20.74 0 0 0 14.883-6.026v4.883h14.107v-48.58h-14.107v5.065a21.39 21.39 0 0 0-14.883-6.032m187.807 0c-13.564 0-22.905 11.27-22.905 25.556a23.37 23.37 0 0 0 6.036 17.506 23.4 23.4 0 0 0 16.869 7.627 20.75 20.75 0 0 0 14.888-6.026v4.883h14.102v-48.58h-14.102v5.065a21.4 21.4 0 0 0-14.888-6.032m-148.813.966v30.139a18.1 18.1 0 0 0 4.932 13.998 18.1 18.1 0 0 0 13.756 5.586 20.72 20.72 0 0 0 15.545-7.172v6.03h14.107v-48.58h-14.107v31.88a13.12 13.12 0 0 1-10.424 5.547 9.1 9.1 0 0 1-7.094-2.897A9.09 9.09 0 0 1 230 460.84v-27.242zm-34.414 10.846a13.64 13.64 0 0 1 10.303 4.584v17.539a13.57 13.57 0 0 1-10.303 4.582c-7.026-.474-12.484-6.308-12.484-13.35s5.458-12.881 12.484-13.355m187.807 0a13.65 13.65 0 0 1 10.308 4.584v17.539a13.58 13.58 0 0 1-10.308 4.582c-7.026-.474-12.485-6.308-12.485-13.35s5.459-12.881 12.485-13.355m118.375.062a13.57 13.57 0 0 1 10.85 5.182v16.338a13.57 13.57 0 0 1-10.85 5.18c-7.028-.473-12.486-6.307-12.486-13.348s5.458-12.878 12.486-13.352" style="fill:#e10915;fill-opacity:1;fill-rule:nonzero;stroke:none"/></svg>