X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b543d65f1670f7a508983a62eb9221246aa4ba3e..84779438f30113a370b0d48ee01bcbe22babb744:/cookbooks/dev/recipes/default.rb

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e29b008cf..0d6790f46 100644
--- 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
@@ -95,6 +96,7 @@ package %w[
   lzip
   lzop
   mailutils
+  moreutils
   make
   nano
   ncftp
@@ -148,12 +150,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