Skip to content

fix reflect-config mismerge#112

Merged
mcred merged 1 commit intotitan-data:masterfrom
eschrock:feature/fix-mismerge
Nov 25, 2019
Merged

fix reflect-config mismerge#112
mcred merged 1 commit intotitan-data:masterfrom
eschrock:feature/fix-mismerge

Conversation

@eschrock
Copy link
Contributor

Proposed Changes

A recent change introduced a mismerge that left reflect-config as invalid JSON due to a trailing comma. This fix eliminates the trailing comma.

Testing

Ran build-osx, which was previously failing.

@eschrock eschrock requested a review from a team as a code owner November 25, 2019 14:59
@mcred mcred merged commit 3f2d001 into titan-data:master Nov 25, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants