fix: resolve merge conflicts
This commit is contained in:
committed by
Bjorn Lammers
parent
b560a099e9
commit
1dde587869
@@ -1 +1 @@
|
||||
<svg fill="none" height="26" viewBox="0 0 114 26" width="114" xmlns="http://www.w3.org/2000/svg"><path d="m23.6977 25.2924h-20.10301c-1.32885 0-2.58954-.6978-3.202853-1.8892-.698493-1.3617-.4429462-2.9956.630343-4.068l13.98692-13.97375h-10.01743c-2.7599 0-4.99167-2.22968-4.99167-4.987h18.5186c1.3288 0 2.5895.69784 3.2028 1.88927.6986 1.36164.443 2.9956-.6303 4.0679l-13.98691 13.97378h11.60181c2.7599 0 4.9917 2.2297 4.9917 4.987zm79.5603-25.2924c-2.879 0-5.4691 1.24249-7.241 3.23389-1.7883-1.9914-4.3781-3.23389-7.2401-3.23389-5.3497 0-9.7108 4.56149-9.7108 9.88887v15.40353c2.7598 0 4.9915-2.2297 4.9915-4.987v-10.46757c0-2.5701 1.9933-4.74871 4.5487-4.85083 2.692-.10213 4.9237 2.05945 4.9237 4.73169v10.58671c0 2.7573 2.2317 4.987 4.9915 4.987v-15.45457c0-2.5701 1.9935-4.74871 4.5485-4.85083 2.692-.10213 4.924 2.05945 4.924 4.73169v10.58671c0 2.7573 2.232 4.987 4.991 4.987v-15.40353c-.017-5.32738-4.378-9.88887-9.727-9.88887zm-54.3805 12.8334c0 7.0806-5.7583 12.8335-12.8455 12.8335-7.0871 0-12.8454-5.7529-12.8454-12.8335 0-7.0805 5.7753-12.8334 12.8454-12.8334 7.0702 0 12.8455 5.7529 12.8455 12.8334zm-4.9917 0c0-4.32315-3.5265-7.8464-7.8538-7.8464-4.3272 0-7.8538 3.52325-7.8538 7.8464 0 4.3233 3.5266 7.8465 7.8538 7.8465 4.3273 0 7.8538-3.5232 7.8538-7.8465zm32.6758 0c0 7.0806-5.758 12.8335-12.8451 12.8335-7.0877 0-12.8458-5.7529-12.8458-12.8335 0-7.0805 5.7757-12.8334 12.8458-12.8334 7.0696 0 12.8451 5.7529 12.8451 12.8334zm-4.9915 0c0-4.32315-3.5264-7.8464-7.8536-7.8464-4.3273 0-7.8541 3.52325-7.8541 7.8464 0 4.3233 3.5268 7.8465 7.8541 7.8465 4.3272 0 7.8536-3.5232 7.8536-7.8465z" fill="#0b5cff"/></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="114" height="26" fill="none"><path fill="#0b5cff" d="M23.698 25.292H3.595c-1.33 0-2.59-.697-3.203-1.889a3.48 3.48 0 0 1 .63-4.068L15.01 5.361H4.992A4.985 4.985 0 0 1 0 .374h18.519c1.328 0 2.59.698 3.202 1.89a3.48 3.48 0 0 1-.63 4.068L7.104 20.305h11.602c2.76 0 4.992 2.23 4.992 4.987M103.258 0a9.66 9.66 0 0 0-7.241 3.234A9.7 9.7 0 0 0 88.777 0c-5.35 0-9.71 4.561-9.71 9.889v15.403c2.759 0 4.99-2.23 4.99-4.987V9.838c0-2.57 1.994-4.749 4.55-4.851a4.746 4.746 0 0 1 4.923 4.732v10.586a4.985 4.985 0 0 0 4.991 4.987V9.838c0-2.57 1.994-4.749 4.549-4.851a4.746 4.746 0 0 1 4.924 4.732v10.586a4.985 4.985 0 0 0 4.991 4.987V9.89C112.968 4.56 108.607 0 103.258 0m-54.38 12.833c0 7.081-5.759 12.834-12.846 12.834s-12.845-5.753-12.845-12.834S28.962 0 36.032 0s12.846 5.753 12.846 12.833m-4.992 0c0-4.323-3.527-7.846-7.854-7.846s-7.854 3.523-7.854 7.846 3.527 7.847 7.854 7.847 7.854-3.523 7.854-7.847m32.676 0c0 7.081-5.758 12.834-12.845 12.834S50.87 19.914 50.87 12.833 56.646 0 63.716 0s12.846 5.753 12.846 12.833m-4.992 0c0-4.323-3.526-7.846-7.853-7.846-4.328 0-7.855 3.523-7.855 7.846s3.527 7.847 7.854 7.847c4.328 0 7.854-3.523 7.854-7.847"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.2 KiB |
Reference in New Issue
Block a user