resolve merge conflict (#827)

Browse Source

...

This commit is contained in:

PizzaLovingNerd

2026-07-06 18:42:01 -07:00

committed by GitHub

parent 9448ae30dd

commit 07bd7a187c

22 changed files with 19 additions and 21 deletions

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

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

BIN

public/docs-static/img/manage/network-routes/use-cases/exit-nodes/netbird-peers-routing-peer-exit-node.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 127 KiB After Width:  |  Height:  |  Size: 94 KiB

BIN

public/docs-static/img/manage/network-routes/use-cases/exit-nodes/netbird-peers-routing-peer.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 154 KiB After Width:  |  Height:  |  Size: 94 KiB

BIN

public/docs-static/img/manage/network-routes/use-cases/exit-nodes/netbird-peers.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 161 KiB After Width:  |  Height:  |  Size: 104 KiB

BIN

public/docs-static/img/manage/peers/access-infrastructure/secure-remote-webserver-access/8I1WVEx.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 113 KiB After Width:  |  Height:  |  Size: 155 KiB

BIN

public/docs-static/img/manage/peers/access-infrastructure/secure-remote-webserver-access/owyUeUn.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 125 KiB After Width:  |  Height:  |  Size: 154 KiB

BIN

public/docs-static/img/manage/peers/access-infrastructure/setup-keys-add-servers-to-network/setup-keys-add-server-02.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 116 KiB After Width:  |  Height:  |  Size: 104 KiB

BIN

public/docs-static/img/manage/peers/access-infrastructure/setup-keys-add-servers-to-network/setup-keys-add-server-03.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 97 KiB After Width:  |  Height:  |  Size: 113 KiB

BIN

public/docs-static/img/manage/peers/add-machines-to-your-network/add-new-peer-empty.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 222 KiB After Width:  |  Height:  |  Size: 103 KiB

BIN

public/docs-static/img/manage/peers/add-machines-to-your-network/add-new-peer-popup.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 145 KiB After Width:  |  Height:  |  Size: 115 KiB

BIN

public/docs-static/img/manage/peers/add-machines-to-your-network/peer-list.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 203 KiB After Width:  |  Height:  |  Size: 104 KiB