projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: becb639)
added openbox-themes and wicd
authorstephen mahood <mv@fsf.org>
Tue, 30 Dec 2014 21:32:15 +0000 (16:32 -0500)
committerstephen mahood <mv@fsf.org>
Tue, 30 Dec 2014 21:32:15 +0000 (16:32 -0500)
package_config/MV patch | blob | blame | history

diff --git a/package_config/MV b/package_config/MV
index 9fa9b518d7f7cf5ae5c34023bd1c8dd8c2e26347..d6d567e9ddd5e775922ba5d82328ff1d34f84308 100644 (file)
--- a/package_config/MV
+++ b/package_config/MV
@@ -2,4 +2,9 @@ PACKAGES aptitude MV
 openbox
 obmenu
 obconf
+<<<<<<< HEAD
+wicd
+openbox-themes
+=======
 bind9
+>>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086