From f8c4e86977db453b7672937c89261c157e383b8b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micka=C3=ABl=20R=C3=A9mond?= Date: Mon, 3 Dec 2007 10:51:22 +0000 Subject: [PATCH] * ChangeLog: Fix conflict. SVN Revision: 1018 --- ChangeLog | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59dd16cfa..1a535bb9f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,6 @@ * src/mod_muc.erl: Added option to limit the number of room a user is allowed to connect to (EJAB-445). * src/mod_muc_room.erl: Likewise. -<<<<<<< HEAD:ChangeLog * doc/guide.tex: Likewise.:ChangeLog 2007-12-02 Badlop @@ -14,9 +13,6 @@ * src/Makefile.in: New options make uninstall and uninstall-all (EJAB-293) -======= - * doc/guide.tex: Likewise. ->>>>>>> * ChangeLog: Update.:ChangeLog 2007-12-01 Mickael Remond -- 2.40.0