Removed Git HEAD & FETCH_HEAD in some files
This commit is contained in:
parent
163e26fbc3
commit
4ed4fe027f
@ -14,10 +14,7 @@ QSimpleUpdater::QSimpleUpdater(QObject *parent)
|
|||||||
, m_version_check_finished(false)
|
, m_version_check_finished(false)
|
||||||
, m_new_version_available(false)
|
, m_new_version_available(false)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
m_downloadDialog = new DownloadDialog();
|
m_downloadDialog = new DownloadDialog();
|
||||||
=======
|
|
||||||
>>>>>>> FETCH_HEAD
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,10 +23,7 @@ public:
|
|||||||
|
|
||||||
QString changeLog() const;
|
QString changeLog() const;
|
||||||
void checkForUpdates();
|
void checkForUpdates();
|
||||||
<<<<<<< HEAD
|
|
||||||
void openDownloadLink();
|
void openDownloadLink();
|
||||||
=======
|
|
||||||
>>>>>>> FETCH_HEAD
|
|
||||||
QString latestVersion() const;
|
QString latestVersion() const;
|
||||||
QString installedVersion() const;
|
QString installedVersion() const;
|
||||||
void downloadLatestVersion();
|
void downloadLatestVersion();
|
||||||
|
Loading…
Reference in New Issue
Block a user