Cleanup unavailable utils

openstreetmap · Jan 14, 2025 · 7ce80b2 · 7ce80b2
1 parent b543d65
commit 7ce80b2
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
@@ -61,6 +61,7 @@
   gnuplot-nox
   golang
   graphviz
+  htop
   irssi
   jq
   libargon2-dev
@@ -148,12 +149,6 @@
   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