[Pkg-owncloud-commits] [owncloud-client] 173/211: SocketAPI: Fix all files are new

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 020e19f770fbc4b91ec64727fb5f2dd3e4504fc9
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Oct 22 15:32:09 2014 +0200

    SocketAPI: Fix all files are new
    
    (Introduced because of bad resolution of merge conflict
    in my last commit)
---
 src/mirall/socketapi.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index d5b526a..d530970 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -565,7 +565,6 @@ SyncFileStatus SocketApi::fileStatus(Folder *folder, const QString& systemFileNa
             qDebug() << Q_FUNC_INFO << "Could not determine state for file" << fileName << "will set STATUS_NEW";
             status.set(SyncFileStatus::STATUS_NEW);
         }
-        status.set(SyncFileStatus::STATUS_NEW);
     }
 
     if (rec.isValid()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git