Closed afajardodelgado closed 2 months ago
@afajardodelgado I fixed the merge conflicts. You will need to git pull origin contract-type
to update your local file. If that creates conflicts, use a text editor to fix them. You can search for ">>>", "===" and "<<<" to find the markers indicating where conflicts occur. I use jsonlint to check that the edited file is valid json; if it isn't, usually I've missed removing a marker or have misplaced a closing bracket or comma.
…ract object