Merge branch 'sudoman-mods'

[fai-configs.git] / package_config / MV

diff --git a/package_config/MV b/package_config/MV
index d6d567e9ddd5e775922ba5d82328ff1d34f84308..30219e03e7adcd5cef3e3cd706a2a4ada5d324b4 100644 (file)
--- a/package_config/MV
+++ b/package_config/MV
@@ -1,10 +1,8 @@
 PACKAGES aptitude MV
-openbox
-obmenu
-obconf
-<<<<<<< HEAD
-wicd
-openbox-themes
-=======
 bind9
->>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086
+gmrun
+tint2
+conky
+clipit
+nitrogen
+emacs-goodies-el