merge conflict fix

14 years ago · e038df3f58
parent e1b082ca9a
commit e038df3f58
1 changed files with 0 additions and 4 deletions
--- a/src/launcherlib/daemon.cpp
+++ b/src/launcherlib/daemon.cpp
@ -673,10 +673,6 @@ void Daemon::parseArgs(const ArgVect & args)
        {
            usage(EXIT_SUCCESS);
        }
-        else if ((*i) == "--quiet" || (*i) == "-q")
-        {
-            m_quiet = true;
-        }
        else
        {
            if ((*i).find_first_not_of(' ') != string::npos)