changes to MV packages

diff --git a/package_config/MV b/package_config/MV
index d6d567e9ddd5e775922ba5d82328ff1d34f84308..c3a62994f041ccd96f270b906aaf778c7540a265 100644 (file)
--- a/package_config/MV
+++ b/package_config/MV
@@ -2,9 +2,11 @@ PACKAGES aptitude MV
 openbox
 obmenu
 obconf
-<<<<<<< HEAD
-wicd
+wicd-gtk
 openbox-themes
-=======
 bind9
->>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086
+gmrun
+tint2
+xfce4-screenshooter
+conky
+