fixed the mistake I made when applying patch

2010-07-18 20:56:19 +02:00 · 2010-07-18 20:56:19 +02:00 · e7690836fd
parent 689de10abf
commit e7690836fd
1 changed files with 0 additions and 4 deletions
--- 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;
                    }