Remove leftovers from merge

2014-02-19 12:06:40 +01:00 · 2014-02-19 12:06:40 +01:00 · 59c0989087
commit 59c0989087
parent 72a089652f
1 changed files with 0 additions and 4 deletions
--- a/lib/Interpreter/Interpreter.cpp
+++ b/lib/Interpreter/Interpreter.cpp
@ -1048,8 +1048,4 @@ namespace cling {
    llvm::Module* module = m_IncrParser->getCodeGenerator()->GetModule();
    return m_ExecutionContext->getAddressOfGlobal(module, SymName, fromJIT);
  }
-<<<<<<< HEAD
-
-=======
->>>>>>> Remove llvm::Type from the cling::Value
 } // namespace cling