diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/module.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/module.cc b/src/module.cc index 9c0272d..35b8edf 100644 --- a/src/module.cc +++ b/src/module.cc @@ -264,10 +264,6 @@ bool FileModule::handleDependencies() // as it will have a relative path. // Iterating manually since we want to modify the container while iterating -<<<<<<< HEAD -======= - std::vector<std::pair<std::string, FileModule*> > modified_modules; ->>>>>>> origin/issue181 FileModule::ModuleContainer::iterator iter = this->usedlibs.begin(); while (iter != this->usedlibs.end()) { FileModule::ModuleContainer::iterator curr = iter++; |