From 112c714f79e4d57479c912371c7aecb35649d350 Mon Sep 17 00:00:00 2001 From: Christopher Kwiatkowski <63965954+docentYT@users.noreply.github.com> Date: Mon, 4 May 2026 11:47:38 +0200 Subject: [PATCH] Resolve conflict --- utilities/parser.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utilities/parser.cpp b/utilities/parser.cpp index 0919ae77..93887479 100644 --- a/utilities/parser.cpp +++ b/utilities/parser.cpp @@ -229,12 +229,8 @@ std::string cParser::readTokenFromStream(bool ToLower, const char *Break) while (token.empty() && mStream->peek() != EOF) { -<<<<<<< HEAD while (mStream->peek() != EOF) { // idk why but with mStream->get(c) not all cars are loaded c = static_cast(mStream->get()); -======= - while (mStream->get(c)) { ->>>>>>> parent of 3a42a8c1 (Revert "Reduce string creations and deletions") if (c == '\n') { ++mLine; }