Removed Git HEAD & FETCH_HEAD in some files

2014-11-06 19:01:10 -06:00 · 2014-11-06 19:01:10 -06:00 · 4ed4fe027f
commit 4ed4fe027f
parent 163e26fbc3
2 changed files with 0 additions and 6 deletions
--- a/QSimpleUpdater/src/qsimpleupdater.cpp
+++ b/QSimpleUpdater/src/qsimpleupdater.cpp
@ -14,10 +14,7 @@ QSimpleUpdater::QSimpleUpdater(QObject *parent)
    , m_version_check_finished(false)
    , m_new_version_available(false)
 {
-<<<<<<< HEAD
    m_downloadDialog = new DownloadDialog();
-=======
->>>>>>> FETCH_HEAD
 }


--- a/QSimpleUpdater/src/qsimpleupdater.h
+++ b/QSimpleUpdater/src/qsimpleupdater.h
@ -23,10 +23,7 @@ public:

    QString changeLog() const;
    void checkForUpdates();
-<<<<<<< HEAD
    void openDownloadLink();
-=======
->>>>>>> FETCH_HEAD
    QString latestVersion() const;
    QString installedVersion() const;
    void downloadLatestVersion();