Fixed conflict

SVN Revision: 887

diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index 998b89c3a8f1c6e0dd0a33bcf9b219b402577166..8c84c1fe9dd09b991278cff3c2a1dbce23c74f79 100644 (file)
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -3,12 +3,10 @@
 %%% Author  : Alexey Shchepin <alexey@sevcom.net>
 %%% Purpose : MUC room stuff
 %%% Created : 19 Mar 2003 by Alexey Shchepin <alexey@sevcom.net>
-%%% Id      : $Id$
 %%%----------------------------------------------------------------------
 
 -module(mod_muc_room).
 -author('alexey@sevcom.net').
--vsn('$Revision$ ').
 
 -behaviour(gen_fsm).
 

diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index 3955fad00c3fcb36c6b4d3cd45ae99939502da5d..4fdbce1f6e997fb160c0454b2ff31dffff584d14 100644 (file)
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -7,10 +7,6 @@
 
 -module(mod_roster).
 -author('alexey@sevcom.net').
-v v v v v v v
-*************
--vsn('$Revision$ ').
-^ ^ ^ ^ ^ ^ ^
 
 -behaviour(gen_mod).
 

diff --git a/src/web/ejabberd_web_admin.erl b/src/web/ejabberd_web_admin.erl
index 8d5fff3821b43203e63adc924db7e83060b8e2f7..ade323cf671687d119eddc806d75d6ce08080c6d 100644 (file)
--- a/src/web/ejabberd_web_admin.erl
+++ b/src/web/ejabberd_web_admin.erl
@@ -10,7 +10,6 @@
 
 -module(ejabberd_web_admin).
 -author('alexey@sevcom.net').
--vsn('$Revision$ ').
 
 %% External exports
 -export([process/2,