ado/ssp
1
1
Fork 0
mirror of https://github.com/red0124/ssp.git synced 2025-01-23 13:05:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP, Fix merge compile error

Browse Source
This commit is contained in:
ado 2023-07-25 01:01:06 +02:00
parent a6db4a7ad2
commit 6dfc30d5c9
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ss/parser.hpp
View File

@ -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_converter_.resplit(next_line_buffer_,
next_line_size_, delim_); next_line_size_, delim_);
>>>>>>> Stashed changes
} }
} }
} }