doylet/Dqn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dqn: Fix rebase error

Browse Source
This commit is contained in:
doyle 2023-06-01 00:05:01 +10:00
parent 8504cbff3a
commit adb429babd
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dqn.h
View File

@ -4955,7 +4955,6 @@ DQN_FILE_SCOPE void Dqn_Log_FVDefault_(Dqn_String8 type, int log_type, void *use
type.size, type.data, type.size, type.data,
type_padding, "", type_padding, "",
reset.size, reset.data, reset.size, reset.data,
>>>>>>> 4540f8b (dqn: Various bug fixes)
file_name.size, file_name.data, file_name.size, file_name.data,
call_site.line); call_site.line);
header_size_no_ansi_codes = header.size - colour.size - Dqn_Print_ESCResetString.size; header_size_no_ansi_codes = header.size - colour.size - Dqn_Print_ESCResetString.size;