Cleanup unavailable utils

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e29b008cffab96924c9cd5138359bd5ac04b5dae..4c88b1c2b5f22d962332455223e98891a31e180f 100644 (file)
--- a/cookbooks/dev/recipes/default.rb
+++ b/cookbooks/dev/recipes/default.rb
@@ -61,6 +61,7 @@ package %w[
   gnuplot-nox
   golang
   graphviz
+  htop
   irssi
   jq
   libargon2-dev
@@ -148,12 +149,6 @@ package %w[
   unrar
   unzip
   whois
-<<<<<<< HEAD
-=======
-  # Unavailable on debian 12
-  #wine32
-  wine
->>>>>>> d9d12032 (Install wine on dev server to run windows-only utils)
   xxd
   zip
   zlib1g-dev