[naviserver-commits] naviserver ChangeLog,1.55,1.56

[Vlad S. <ser...@us...>]

Update of /cvsroot/naviserver/naviserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8460

Modified Files:
	ChangeLog 
Log Message:
removed CVS >>> from the file


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** ChangeLog	26 Apr 2005 15:59:41 -0000	1.55
--- ChangeLog	26 Apr 2005 16:00:17 -0000	1.56
***************
*** 46,50 ****
  	This was introduced (again) by the changes below.
  
- >>>>>>> 1.54
  2005-04-16  Zoran Vasiljevic  <vas...@us...>
  
--- 46,49 ----