From e7690836fdcb35f64956f8cebdf04b4fb4197e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <danielm77@spray.se>
Date: Sun, 18 Jul 2010 20:56:19 +0200
Subject: [PATCH] fixed the mistake I made when applying patch

---
 lib/tokenize.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
index 56befec09..21f01524b 100644
--- a/lib/tokenize.cpp
+++ b/lib/tokenize.cpp
@@ -359,11 +359,7 @@ void Tokenizer::createTokens(std::istream &code)
                 {
                     if (lineNumbers.empty() || fileIndexes.empty())
                     {
-<<<<<<< HEAD
                         cppcheckError(0);
-=======
-                        std::cerr << "####### Preprocessor bug! #######\n";
->>>>>>> asd
                         deallocateTokens();
                         return;
                     }