[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/svn/ksvnd
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-05-05 21:47:13
Message-ID: 1115329633.870346.20239.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 409879 by marchand:

woups



 M  +0 -1      trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp  


--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #409878:409879
@@ -53,7 +53,6 @@
 		return QString::null;
 }
 
-<<<<<<< .mine
 bool KSvnd::AreAnyFilesInSvn( const KURL::List& wclist ) {
 	for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) {
 		if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" ) )
[prev in list] [next in list] [prev in thread] [next in thread]