diff options
| author | Mickaël Rémond <mickael.remond@process-one.net> | 2007-12-03 10:51:22 +0000 |
|---|---|---|
| committer | Mickaël Rémond <mickael.remond@process-one.net> | 2007-12-03 10:51:22 +0000 |
| commit | f8c4e86977db453b7672937c89261c157e383b8b (patch) | |
| tree | b3251995e0c0c47f242b9944d7691b48a04c4c36 | |
| parent | * ChangeLog: Update. (diff) | |
* ChangeLog: Fix conflict.
SVN Revision: 1018
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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 <badlop@process-one.net> @@ -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 <mremond@process-one.net> |