Remove superflous conflict case.

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