From 1603e627a38ae352b3d3b60d41e2eaf491d4e40f Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Sat, 17 Aug 2013 17:56:16 +0200 Subject: [PATCH] Remove superflous conflict case. --- src/mirall/progressdispatcher.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp index fe8237fa4..9d73a4b3c 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/mirall/progressdispatcher.cpp @@ -55,9 +55,6 @@ QString Progress::asResultString( Kind kind ) case StartDelete: re = QCoreApplication::translate( "progress", "For deletion"); break; - case Conflict: - re = QCoreApplication::translate( "progress", "Conflict"); - break; case EndDelete: re = QCoreApplication::translate( "progress", "deleted"); break; @@ -109,9 +106,6 @@ QString Progress::asActionString( Kind kind ) case EndDelete: re = QCoreApplication::translate( "progress", "deleted"); break; - case Conflict: - re = QCoreApplication::translate( "progress", "conflict file"); - break; default: Q_ASSERT(false); }