From 4436d376a8d426867f217b03838570a424b09c5f Mon Sep 17 00:00:00 2001
From: LostDragonist <lost.dragonist@gmail.com>
Date: Wed, 12 Dec 2018 20:26:35 -0600
Subject: Clean up and fix merge issues

---
 src/modlist.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/modlist.h')

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);
 
-- 
cgit v1.3.1