Update of /cvsroot/thyapi/thyapi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20836
Modified Files:
.sync_svn2cvs
Log Message:
Commiting file additions and modification from SVN revision 1986 to 1987...
Changes made by vinicius on 2005-09-23 03:04:30 +0200 (Fri, 23 Sep 2005) corresponding to SVN revision 1987 with message:
remove conflict
Index: .sync_svn2cvs
===================================================================
RCS file: /cvsroot/thyapi/thyapi/.sync_svn2cvs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** .sync_svn2cvs 23 Sep 2005 00:44:28 -0000 1.20
--- .sync_svn2cvs 23 Sep 2005 00:44:40 -0000 1.21
***************
*** 1,6 ****
! 1987
! a:2:{s:5:"added";a:0:{}s:8:"messages";s:140:"Changes made by vinicius on 2005-09-23 03:04:30 +0200 (Fri, 23 Sep 2005) corresponding to SVN revision 1987 with message:
!
! remove conflict
!
! ";}
\ No newline at end of file
--- 1 ----
! 1987
\ No newline at end of file
|
