diff options
| author | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:26:35 -0600 |
|---|---|---|
| committer | LostDragonist <lost.dragonist@gmail.com> | 2018-12-12 20:35:23 -0600 |
| commit | 4436d376a8d426867f217b03838570a424b09c5f (patch) | |
| tree | 8afa85ec70e2bb571304088806d8b78686e06f50 /src/modlist.h | |
| parent | 40c82fc1908a8ca53abeeabdc618e81e941c987c (diff) | |
Clean up and fix merge issues
Diffstat (limited to 'src/modlist.h')
| -rw-r--r-- | src/modlist.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/modlist.h b/src/modlist.h index a8263a76..49627d68 100644 --- a/src/modlist.h +++ b/src/modlist.h @@ -115,8 +115,6 @@ public: void setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);
void setArchiveLooseOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);
- void setArchiveOverwriteMarkers(const std::set<unsigned int> &overwrite, const std::set<unsigned int> &overwritten);
-
bool modInfoAboutToChange(ModInfo::Ptr info);
void modInfoChanged(ModInfo::Ptr info);
|