diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 06:17:25 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 06:17:25 (GMT) |
| commit | 9b7c83bbda30c0896067895e8bb640a9c3dcb039 (patch) | |
| tree | b7f85383f420c6a9cfb387e209bab389bc8c1603 | |
| parent | a0a49b0bc968179b3a1ff65c12cffceb942f538e (diff) | |
missed one conflict
| -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++; |