diff options
| author | Mikaël Capelle <capelle.mikael@gmail.com> | 2021-02-12 18:07:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 18:07:56 +0100 |
| commit | 7531a860cf22d8573f96d74495a3e32b528d7dd6 (patch) | |
| tree | 2f5ebc24ccfd4a8e59eea6b896559c757375e62a /src/modinfo.h | |
| parent | 7d36bc20d0a6c327079141149a7f138c0f7726ac (diff) | |
| parent | 595f6eccf615c0cf70c8d32e3edb515578efddc9 (diff) | |
Merge pull request #1400 from Holt59/fix-markers-conflicts-refresh
Better refresh of override markers and conflicts.
Diffstat (limited to 'src/modinfo.h')
| -rw-r--r-- | src/modinfo.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/modinfo.h b/src/modinfo.h index f93296d2..b835f352 100644 --- a/src/modinfo.h +++ b/src/modinfo.h @@ -897,11 +897,6 @@ public: // Conflicts // virtual const std::set<unsigned int>& getModArchiveLooseOverwritten() const { return s_EmptySet; } - /** - * @brief Update conflict information. - */ - virtual void doConflictCheck() const {} - public slots: /** |