WIP, Fix merge compile error

2025-12-14 13:59:54 +01:00 · 2023-07-25 01:01:06 +02:00
parent a6db4a7ad2
commit 6dfc30d5c9
1 changed files with 0 additions and 5 deletions
--- 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
                }
            }
        }