Build fix.

Reviewed-by: kh

src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h

@@ -88,11 +88,6 @@ public:
     MaemoDeviceConfig deviceConfig() const;
     QString runtimeGdbServerPort() const;
 
-<<<<<<< HEAD
-=======
-    const QString sshCmd() const;
-    const QString scpCmd() const;
->>>>>>> origin/2.0
     const QString gdbCmd() const;
     const QString dumperLib() const;
 
@@ -113,10 +108,6 @@ private slots:
 
 private:
     void init();
-<<<<<<< HEAD
-=======
-    const QString cmd(const QString &cmdName) const;
->>>>>>> origin/2.0
     const MaemoToolChain *toolchain() const;
     bool fileNeedsDeployment(const QString &path, const QDateTime &lastDeployed) const;
     void addDeployTimesToMap(const QString &key,