From 6dfc30d5c9adb7e2c622ce89f010fd599fc3b364 Mon Sep 17 00:00:00 2001 From: ado Date: Tue, 25 Jul 2023 01:01:06 +0200 Subject: [PATCH] WIP, Fix merge compile error --- include/ss/parser.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/ss/parser.hpp b/include/ss/parser.hpp index 0f6bf02..5f4cae7 100644 --- a/include/ss/parser.hpp +++ b/include/ss/parser.hpp @@ -681,13 +681,8 @@ private: } } -<<<<<<< Updated upstream - next_line_converter_.resplit(next_line_buffer_, size, - delim_); -======= next_line_converter_.resplit(next_line_buffer_, next_line_size_, delim_); ->>>>>>> Stashed changes } } }