🩹 Fix merge conflict

This commit is contained in:
Bjorn Lammers 2024-03-21 01:17:01 +01:00
commit e441a6b882
3 changed files with 37 additions and 0 deletions

32
.gitignore vendored Normal file
View File

@ -0,0 +1,32 @@
### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
### macOS Patch ###
# iCloud generated files
*.icloud

BIN
png/netbird.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

5
svg/netbird.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="41" height="30" viewBox="0 0 41 30" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M28.5735 0C23.7203 0.445248 21.3049 3.23918 20.3921 4.65284L6.21094 29.2194H23.3196L40.1945 0H28.5735Z" fill="#F68330"/>
<path d="M23.331 29.2198L0 4.47517C0 4.47517 26.381 -2.6154 28.9523 19.5023L23.331 29.2198Z" fill="#F68330"/>
<path d="M19.8683 5.56728L12.7109 17.9674L23.319 29.2211L28.9402 19.4813C28.0497 11.8787 24.343 7.72674 19.8683 5.55615" fill="#F35E32"/>
</svg>

After

Width:  |  Height:  |  Size: 481 B