[naviserver-commits] naviserver ChangeLog,1.110,1.111

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

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

Modified Files:
	ChangeLog 
Log Message:
removed CVS's <<<< symbols


Index: ChangeLog
===================================================================
RCS file: /cvsroot/naviserver/naviserver/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ChangeLog	11 Jun 2005 20:04:11 -0000	1.110
--- ChangeLog	11 Jun 2005 20:04:39 -0000	1.111
***************
*** 13,17 ****
  	* nsd/nslog.c: Say NULL rather than 0 when talking about null pointers.
  
- >>>>>>> 1.109
  2005-06-11  Zoran Vasiljevic  <vas...@us...>
  
--- 13,16 ----