Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mismerge in pull request #204. #205

Merged
merged 1 commit into from
Apr 2, 2019
Merged

Fix mismerge in pull request #204. #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix mismerge.
  • Loading branch information
@sobomax
sobomax committed Apr 2, 2019
commit d9207c49e82a7214b9736214d2be903c3e3267e2
2 changes: 1 addition & 1 deletion src/ucl_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ ucl_parser_add_container (ucl_object_t *obj, struct ucl_parser *parser,
goto enomem1;
}

st->obj = obj;
st->obj = nobj;

if (level >= UINT16_MAX) {
ucl_set_err (parser, UCL_ENESTED,
Expand Down