From 4ed4fe027f80bc7578b151dfe9e34e428ac651d5 Mon Sep 17 00:00:00 2001 From: Alex Spataru Date: Thu, 6 Nov 2014 19:01:10 -0600 Subject: [PATCH] Removed Git HEAD & FETCH_HEAD in some files --- QSimpleUpdater/src/qsimpleupdater.cpp | 3 --- QSimpleUpdater/src/qsimpleupdater.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/QSimpleUpdater/src/qsimpleupdater.cpp b/QSimpleUpdater/src/qsimpleupdater.cpp index f2d03e9..31fefe9 100644 --- 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 } diff --git a/QSimpleUpdater/src/qsimpleupdater.h b/QSimpleUpdater/src/qsimpleupdater.h index 2f7815d..edb115a 100644 --- 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();