fix: resolve merge conflicts

This commit is contained in:
Dashboard Icons Bot
2025-01-05 02:54:50 +00:00
committed by Bjorn Lammers
parent b560a099e9
commit 1dde587869
4944 changed files with 1635 additions and 73999 deletions

View File

@@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Orcid" role="img" version="1.1" viewBox="20.43 19.15 472.02 477.37"><path fill="#44a9fe" stroke-width="1.044" d="m90.98 495.78c-34.039-4.4764-59.899-27.897-68.719-62.235-1.7089-6.6535-1.8315-18.425-1.8315-175.78v-168.65l2.3243-8.7141c7.9697-29.879 29.048-50.957 58.926-58.926l8.7141-2.3243h166.04c152.46 0 166.6 0.14424 172.88 1.764 26.707 6.8875 46.673 23.455 56.524 46.903 7.0704 16.828 6.6004 3.3051 6.6004 189.94v168.65l-2.3243 8.7141c-7.9194 29.691-28.665 50.673-58.242 58.906l-8.354 2.3254-162.9 0.15257c-89.597 0.0838-165.93-0.24538-169.63-0.73175zm170.82-162.88c20.825-5.2747 34.521-18.343 38.017-36.274 3.6656-18.801-5.5851-37.395-22.503-45.232-3.446-1.5963-16.369-5.5775-28.717-8.8472-29.901-7.9175-35.478-10.899-37.16-19.865-1.677-8.9393 3.7918-17.332 13.113-20.125 5.2787-1.5815 19.883-1.7076 24.917-0.21512 7.5208 2.2295 12.778 6.3028 15.398 11.93 1.3786 2.9608 2.5111 6.407 2.5167 7.6582 0.0208 4.6278 2.446 5.5569 14.505 5.5569 14.98 0 15.6-0.45028 13.832-10.044-4.5236-24.55-26.626-40.08-57.043-40.08-24.594 0-44.122 9.999-52.343 26.802-2.4619 5.0319-3.0102 7.6603-3.3334 15.978-0.47883 12.325 1.7889 19.294 8.8231 27.118 6.707 7.4598 15.85 11.58 39.54 17.818 30.89 8.1342 34.106 9.443 38.412 15.636 2.2802 3.2792 2.4403 14.549 0.26645 18.753-4.202 8.1257-13.956 12.108-29.277 11.954-12.041-0.12098-20.127-2.5954-26.357-8.0654-4.1882-3.6773-8.5994-12.217-8.6149-16.677-0.0227-6.5413-0.93651-6.98-14.539-6.98-15.301 0-15.351 0.0392-13.706 10.647 4.5867 29.562 31.039 47.07 67.916 44.952 4.8819-0.28038 12.233-1.36 16.336-2.3993zm-146.55-2.6848c15.156-3.4226 29.38-13.147 37.313-25.509 14.942-23.286 16.446-63.715 3.3689-90.596-5.353-11.003-15.685-21.454-26.378-26.681-12.548-6.1332-19.304-6.9335-58.533-6.9335-32.874 0-34.378 0.0857-35.413 2.0198-1.4954 2.7942-1.4954 144.58 0 147.38 1.0362 1.9362 2.5522 2.0198 36.604 2.0198 29.014 0 36.9-0.31097 43.039-1.6973zm-51.484-74.011v-51.69h16.516c19.112 0 26.547 1.1212 34.603 5.2183 15.475 7.8694 21.158 20.352 21.158 46.472 0 20.64-3.2277 31.721-11.711 40.204-9.0503 9.0503-18.068 11.487-42.512 11.487h-18.055zm283.4 74.056c0.34862-0.90848 0.66566-25.226 0.70452-54.04 0.0459-34.009 0.4197-51.656 1.0656-50.3 0.54718 1.1487 9.3525 25.349 19.567 53.779l18.573 51.69 11.12 0.29592c10.598 0.28202 11.192 0.18394 12.642-2.0885 0.83691-1.3114 9.601-24.94 19.476-52.508 9.8747-27.568 18.36-50.829 18.856-51.69 0.51625-0.89609 0.92284 21 0.95014 51.168 0.0262 29.004 0.43037 53.338 0.89801 54.075 0.63227 0.99644 4.0416 1.2642 13.298 1.0442l12.448-0.29574v-150.37l-17.752-0.25872c-9.7638-0.14231-18.375 0.14228-19.136 0.6324-0.76121 0.49013-9.9245 25.747-20.363 56.126-10.438 30.379-19.391 55.235-19.896 55.235-0.50428 0-9.5998-24.67-20.212-54.823-10.612-30.153-19.782-55.421-20.377-56.152-0.81751-1.0048-5.5652-1.2594-19.469-1.0442l-18.388 0.28456-0.27023 74.142c-0.14861 40.778-0.0458 74.729 0.22829 75.447 0.3603 0.94341 3.951 1.3053 12.951 1.3053 10.391 0 12.557-0.27335 13.086-1.6518z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" aria-label="Orcid" viewBox="20.43 19.15 472.02 477.37"><path fill="#44a9fe" d="M90.98 495.78c-34.039-4.476-59.899-27.897-68.719-62.235-1.709-6.654-1.831-18.425-1.831-175.78V89.115l2.324-8.714c7.97-29.88 29.048-50.957 58.926-58.926l8.714-2.324h166.04c152.46 0 166.6.144 172.88 1.764 26.707 6.887 46.673 23.455 56.524 46.903 7.07 16.828 6.6 3.305 6.6 189.94v168.65l-2.324 8.714c-7.92 29.69-28.665 50.673-58.242 58.906l-8.354 2.325-162.9.153c-89.597.083-165.93-.246-169.63-.732zM261.8 332.9c20.825-5.275 34.521-18.343 38.017-36.274 3.666-18.801-5.585-37.395-22.503-45.232-3.446-1.596-16.369-5.578-28.717-8.847-29.901-7.918-35.478-10.9-37.16-19.865-1.677-8.94 3.792-17.332 13.113-20.125 5.279-1.582 19.883-1.708 24.917-.215 7.52 2.23 12.778 6.302 15.398 11.93 1.379 2.96 2.511 6.407 2.517 7.658.02 4.628 2.446 5.557 14.505 5.557 14.98 0 15.6-.45 13.832-10.044-4.524-24.55-26.626-40.08-57.043-40.08-24.594 0-44.122 9.999-52.343 26.802-2.462 5.032-3.01 7.66-3.334 15.978-.479 12.325 1.79 19.294 8.823 27.118 6.707 7.46 15.85 11.58 39.54 17.818 30.89 8.134 34.106 9.443 38.412 15.636 2.28 3.279 2.44 14.549.267 18.753-4.202 8.125-13.956 12.108-29.277 11.954-12.041-.121-20.127-2.596-26.357-8.066-4.188-3.677-8.6-12.217-8.615-16.677-.023-6.54-.937-6.98-14.539-6.98-15.301 0-15.351.04-13.706 10.647 4.587 29.562 31.039 47.07 67.916 44.952 4.882-.28 12.233-1.36 16.336-2.399zm-146.55-2.685c15.156-3.422 29.38-13.147 37.313-25.509 14.942-23.286 16.446-63.715 3.369-90.596-5.353-11.003-15.685-21.454-26.378-26.68-12.548-6.134-19.304-6.934-58.533-6.934-32.874 0-34.378.085-35.413 2.02-1.495 2.794-1.495 144.58 0 147.38 1.036 1.936 2.552 2.02 36.604 2.02 29.014 0 36.9-.312 43.039-1.698zm-51.484-74.01v-51.69h16.516c19.112 0 26.547 1.12 34.603 5.218 15.475 7.869 21.158 20.352 21.158 46.472 0 20.64-3.228 31.72-11.711 40.204-9.05 9.05-18.068 11.487-42.512 11.487H63.765zm283.4 74.055c.349-.908.666-25.226.705-54.04.045-34.009.42-51.656 1.065-50.3.547 1.149 9.353 25.35 19.567 53.78l18.573 51.69 11.12.295c10.598.282 11.192.184 12.642-2.088.837-1.312 9.601-24.94 19.476-52.508s18.36-50.83 18.856-51.69c.516-.896.923 21 .95 51.168.026 29.004.43 53.338.898 54.075.633.996 4.042 1.264 13.298 1.044l12.448-.296V181.02l-17.752-.259c-9.764-.142-18.375.143-19.136.633s-9.924 25.747-20.363 56.126-19.39 55.235-19.896 55.235c-.504 0-9.6-24.67-20.212-54.823s-19.782-55.421-20.377-56.152c-.817-1.005-5.565-1.26-19.469-1.044l-18.388.284-.27 74.142c-.149 40.778-.046 74.73.228 75.447.36.944 3.951 1.305 12.951 1.305 10.391 0 12.557-.273 13.086-1.651z"/></svg>

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB