X-Git-Url: https://vcs.fsf.org/?p=fai-configs.git;a=blobdiff_plain;f=package_config%2FMV;h=d77fdb371acc8f1f6800e0ccbe3609db5d4a3882;hp=d6d567e9ddd5e775922ba5d82328ff1d34f84308;hb=460db2e99e4d09623df77752171f5dbcd0274ca7;hpb=8b918118d263588eb57a7cc1d43b781790e0ac91

diff --git a/package_config/MV b/package_config/MV
index d6d567e..d77fdb3 100644
--- a/package_config/MV
+++ b/package_config/MV
@@ -2,9 +2,14 @@ PACKAGES aptitude MV
 openbox
 obmenu
 obconf
-<<<<<<< HEAD
-wicd
+wicd-gtk
 openbox-themes
-=======
 bind9
->>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086
+gmrun
+tint2
+xfce4-screenshooter
+conky
+clipit
+guake
+nitrogen
+emacs-goodies-el
\ No newline at end of file