fix: resolve merge conflicts

Browse Source

...

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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

png/13ft.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 9.3 KiB

BIN

png/1password-dark.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 32 KiB After Width:  |  Height:  |  Size: 23 KiB

BIN

png/1password.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 33 KiB After Width:  |  Height:  |  Size: 24 KiB

BIN

png/2fauth-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 923 B

BIN

png/2fauth.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 923 B

BIN

png/3cx-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/3cx.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/5etools-dark.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 41 KiB After Width:  |  Height:  |  Size: 30 KiB

BIN

png/5etools.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 44 KiB After Width:  |  Height:  |  Size: 31 KiB

BIN

png/7zip.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 8.9 KiB

BIN

png/act.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/activepieces.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 6.1 KiB

BIN

png/actual-budget.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/adguard-home.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/adminer.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 17 KiB

BIN

png/adventure-log.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

png/affine-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/affine.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/airsonic.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 7.5 KiB

BIN

png/airtable.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/airtel.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 7.3 KiB

BIN

png/airvpn.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/akkoma-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/akkoma.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/alarmpi.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 41 KiB After Width:  |  Height:  |  Size: 35 KiB

BIN

png/albert-heijn.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/alertmanager.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 8.8 KiB

BIN

png/aliexpress.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 12 KiB After Width:  |  Height:  |  Size: 8.9 KiB

BIN

png/alist.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 15 KiB

BIN

png/alloy.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/alltube-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

png/alltube.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

png/alma-linux.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 33 KiB After Width:  |  Height:  |  Size: 23 KiB

BIN

png/alpine-linux.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/amazon-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/amazon-prime.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 27 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/amazon-web-services-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 33 KiB After Width:  |  Height:  |  Size: 22 KiB

BIN

png/amazon-web-services.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 22 KiB

BIN

png/amazon.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/amd-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.1 KiB After Width:  |  Height:  |  Size: 1.9 KiB

BIN

png/amd.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 4.4 KiB After Width:  |  Height:  |  Size: 1.9 KiB

BIN

png/android-auto-dark.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 36 KiB After Width:  |  Height:  |  Size: 28 KiB

BIN

png/android-auto.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 31 KiB After Width:  |  Height:  |  Size: 24 KiB

BIN

png/android-robot.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/android.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 7.7 KiB

BIN

png/anonaddy.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

png/ansible-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 8.6 KiB

BIN

png/ansible.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

png/anything-llm-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/anything-llm.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 17 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/apache-airflow.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 21 KiB

BIN

png/apache-answer.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.1 KiB After Width:  |  Height:  |  Size: 4.2 KiB

BIN

png/apache-cassandra.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 58 KiB After Width:  |  Height:  |  Size: 38 KiB

BIN

png/apache-cloudstack.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 46 KiB After Width:  |  Height:  |  Size: 32 KiB

BIN

png/apache-druid.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 8.1 KiB

BIN

png/apache-openoffice.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 16 KiB

BIN

png/apache-solr.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 32 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/apache-subversion.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

png/apache-tomcat-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 49 KiB After Width:  |  Height:  |  Size: 33 KiB

BIN

png/apache-tomcat.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 51 KiB After Width:  |  Height:  |  Size: 36 KiB

BIN

png/apache.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 29 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

png/apc.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 12 KiB After Width:  |  Height:  |  Size: 7.4 KiB

BIN

png/apiscp.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 52 KiB After Width:  |  Height:  |  Size: 35 KiB

BIN

png/app-store.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/appflowy.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 26 KiB After Width:  |  Height:  |  Size: 20 KiB

BIN

png/apple-alt.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 14 KiB After Width:  |  Height:  |  Size: 9.8 KiB

BIN

png/apple-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 5.5 KiB

BIN

png/apple-music.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 13 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/apple-tv-plus-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/apple-tv-plus.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/apple.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 5.5 KiB

BIN

png/appwrite.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 15 KiB After Width:  |  Height:  |  Size: 5.8 KiB

BIN

png/ara-records-ansible.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 39 KiB After Width:  |  Height:  |  Size: 28 KiB

BIN

png/arch-linux.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 6.8 KiB

BIN

png/archiveteam-warrior-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 81 KiB After Width:  |  Height:  |  Size: 57 KiB

BIN

png/arduino.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 18 KiB After Width:  |  Height:  |  Size: 7.4 KiB

BIN

png/argo-cd.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 42 KiB After Width:  |  Height:  |  Size: 31 KiB

BIN

png/arm.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 30 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/artifacthub.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 19 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/artifactory.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 6.4 KiB

BIN

png/aruba.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 7.1 KiB

BIN

png/asana.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 53 KiB After Width:  |  Height:  |  Size: 35 KiB

BIN

png/asciinema.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 8.3 KiB After Width:  |  Height:  |  Size: 2.6 KiB

BIN

png/asrock-rack-ipmi.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 48 KiB After Width:  |  Height:  |  Size: 34 KiB

BIN

png/asrock-rack.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 48 KiB After Width:  |  Height:  |  Size: 34 KiB

BIN

png/astral.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 32 KiB After Width:  |  Height:  |  Size: 11 KiB

BIN

png/astuto-light.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 25 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/astuto.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/asus-rog.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 38 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/asus-router.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

png/asus.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 46 KiB After Width:  |  Height:  |  Size: 18 KiB

BIN

png/asustor.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 20 KiB After Width:  |  Height:  |  Size: 13 KiB

BIN

png/at-t.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 45 KiB After Width:  |  Height:  |  Size: 32 KiB

BIN

png/atlassian-bamboo.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 16 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

png/atlassian-bitbucket.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 24 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/atlassian-confluence.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 42 KiB After Width:  |  Height:  |  Size: 21 KiB

BIN

png/atlassian-jira.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/atlassian-opsgenie.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 22 KiB After Width:  |  Height:  |  Size: 14 KiB

BIN

png/atlassian-trello.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.6 KiB After Width:  |  Height:  |  Size: 6.1 KiB

BIN

png/atlassian.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 21 KiB After Width:  |  Height:  |  Size: 12 KiB

Some files were not shown because too many files have changed in this diff Show More