projects
/
fai-configs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
added apache2 to ejabberd class
[fai-configs.git]
/
package_config
/
MV
diff --git
a/package_config/MV
b/package_config/MV
index
d6d567e
..
30219e0
100644
(file)
--- a/
package_config/MV
+++ b/
package_config/MV
@@
-1,10
+1,8
@@
PACKAGES aptitude MV
-openbox
-obmenu
-obconf
-<<<<<<< HEAD
-wicd
-openbox-themes
-=======
bind9
->>>>>>> becb639a7cbbd2e939d018df7a0ae305b906b086
+gmrun
+tint2
+conky
+clipit
+nitrogen
+emacs-goodies-el