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
--- a/svg/jelu.svg
+++ b/svg/jelu.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg5" width="180" height="180" version="1.1" viewBox="0 0 180 180"><g id="layer1"><rect style="fill:#f7f5d1;fill-opacity:1;fill-rule:evenodd;stroke-width:1.002;stroke-miterlimit:4;stroke-dasharray:none" id="background" width="180" height="180" x="0" y="0"/><g id="text3176" aria-label="J" transform="scale(0.91457227,1.0934073)" style="font-size:175.161px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell, @wght=700';font-variation-settings:'wght' 700;fill:#262429;stroke-width:4.57959653;paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"><path id="path5497" d="m 54.449649,143.43516 c 23.821895,0 37.484453,-14.71353 37.484453,-40.46219 V 20.121817 H 69.163173 v 84.427603 c 0,12.43643 -5.605152,19.09255 -16.289973,19.09255 -5.079669,0 -11.560626,-1.57645 -16.289973,-3.67839 l -6.480956,17.34094 c 7.356761,4.20387 15.764489,6.13064 24.347378,6.13064 z" style="paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.57959653;stroke-miterlimit:4;stroke-dasharray:none"/></g><g id="text4104" aria-label="l" transform="scale(0.96655236,1.0346051)" style="font-size:175.161px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:'Cantarell, @wght=700';font-variation-settings:'wght' 700;fill:#262429;stroke-width:4.45935726;paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"><path id="path5500" d="m 127.32625,152.08461 c 5.42999,0 11.73578,-1.22613 16.28997,-3.1529 l -4.55419,-15.06385 c -1.92677,0.70065 -3.85354,1.05097 -5.42999,1.05097 -5.25483,0 -8.0574,-3.32806 -8.0574,-9.28353 V 21.239343 H 103.50435 V 128.43787 c 0,14.71353 8.93321,23.64674 23.8219,23.64674 z" style="paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.45935726;stroke-miterlimit:4;stroke-dasharray:none"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="180" height="180"><path d="M0 0h180v180H0z" style="fill:#f7f5d1;fill-opacity:1;fill-rule:evenodd;stroke-width:1.002;stroke-miterlimit:4;stroke-dasharray:none"/><g style="font-size:175.161px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:&quot;Cantarell, @wght=700&quot;;font-variation-settings:&quot;wght&quot;700;fill:#262429;stroke-width:4.57959653;paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"><path d="M54.45 143.435c23.822 0 37.484-14.713 37.484-40.462V20.122h-22.77v84.427c0 12.437-5.606 19.093-16.29 19.093-5.08 0-11.561-1.576-16.29-3.678l-6.482 17.34c7.357 4.204 15.765 6.131 24.348 6.131" aria-label="J" style="paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.57959653;stroke-miterlimit:4;stroke-dasharray:none" transform="scale(.91457 1.0934)"/></g><g style="font-size:175.161px;line-height:1.25;font-family:Cantarell;-inkscape-font-specification:&quot;Cantarell, @wght=700&quot;;font-variation-settings:&quot;wght&quot;700;fill:#262429;stroke-width:4.45935726;paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"><path d="M127.326 152.085c5.43 0 11.736-1.227 16.29-3.153l-4.554-15.064c-1.927.7-3.854 1.05-5.43 1.05-5.255 0-8.057-3.327-8.057-9.283V21.24h-22.07v107.199c0 14.713 8.933 23.647 23.821 23.647" aria-label="l" style="paint-order:normal;stroke:#262429;stroke-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-width:4.45935726;stroke-miterlimit:4;stroke-dasharray:none" transform="scale(.96655 1.0346)"/></g></svg>