From 9b7c83bbda30c0896067895e8bb640a9c3dcb039 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Tue, 18 Jun 2013 02:17:25 -0400
Subject: missed one conflict


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++;
-- 
cgit v0.10.1