From 9baf67472f76f0583518258f3572e3d9d0d01d5c Mon Sep 17 00:00:00 2001
From: stephen mahood <mv@fsf.org>
Date: Fri, 2 Jan 2015 10:39:48 -0500
Subject: [PATCH] changes to MV packages

---
 package_config/MV | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package_config/MV b/package_config/MV
index d6d567e..c3a6299 100644
--- 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
+
-- 
2.25.1