projects
/
fai-configs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
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 3ebe1a12aa19c819eb8ef0a85170294819972084..d6d567e9ddd5e775922ba5d82328ff1d34f84308 100644
(file)
--- a/
package_config/MV
+++ b/
package_config/MV
@@
-1,4
+1,10
@@
-PACKAGES aptitude
+PACKAGES aptitude
MV
openbox
obmenu
obconf
+<<<<<<< HEAD
+wicd
+openbox-themes
+=======
+bind9
+>>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086