Update of /var/cvs/lunar/moonbase/zbeta/emacs-cvs In directory dbguin.lunar-linux.org:/tmp/cvs-serv9158 Added Files: CONFLICTS Log Message: Added the conflict with emacs. Jasper allowed me to do this one :") --- NEW FILE: CONFLICTS --- conflicts emacs