mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 09:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

Remove superflous conflict case.

Browse source
This commit is contained in:
Klaas Freitag 2013-08-17 17:56:16 +02:00
parent bf978b3e0f
commit 1603e627a3
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mirall/progressdispatcher.cpp
View file

@ -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);
}