projects / fai-configs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added openbox-themes and wicd
[fai-configs.git] / package_config / MV
diff --git a/package_config/MV b/package_config/MV
index fe907af62f1f04376437aafefcc68ece971d2098..d6d567e9ddd5e775922ba5d82328ff1d34f84308 100644 (file)
--- a/package_config/MV
+++ b/package_config/MV
@@ -1,6 +1,10 @@
-PACKAGES aptitude
+PACKAGES aptitude MV
 openbox
 obmenu
 obconf
 openbox
 obmenu
 obconf
+<<<<<<< HEAD
 wicd
 wicd
-openbox-themes
\ No newline at end of file
+openbox-themes
+=======
+bind9
+>>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086