@@ -4,4 +4,3 @@ github.com/OJ/gobuster/v3@latest
github.com/ffuf/ffuf/v2@latest
git.aetherial.dev/aeth/kyoketsu/cmd/kyoketsu@develop
git.aetherial.dev/aeth/kyoketsu/cmd/kyoketsu-web@develop
->>>>>>> d040f780e55b8b900b65778e713f3943282c87eb
@@ -23,13 +23,8 @@ wireplumber
alsa-firmware
htop
nmap
-<<<<<<< HEAD
zaproxy
jwt-cli
wireshark-qt
-=======
bind
git
-bind
-git
@@ -4,7 +4,6 @@ workstations:
voodoo-box.void:
BLACKMESA.void:
spit-wizard.void:
- localhost:
virtualization:
hosts:
adeptus-mechanicus.void: