From: Guillaume RISCHARD <git@stereo.lu>
Date: Tue, 14 Jan 2025 16:34:15 +0000 (-0500)
Subject: Cleanup unavailable utils
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/7ce80b29d9f528a55c5b214782daa60266b7454e

Cleanup unavailable utils
---

diff --git a/cookbooks/dev/recipes/default.rb b/cookbooks/dev/recipes/default.rb
index e29b008cf..4c88b1c2b 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
@@ -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