Closed edwardchalstrey1 closed 2 years ago
@acocac please could you review?
The changes look good to me.
@acocac I don't have the power to merge, can you do it?
@edwardchalstrey1 nope, it says there are conflicts that must be resolved.
@edwardchalstrey1 nope, it says there are conflicts that must be resolved.
I can't view the conflict, what does it say?
It says the conflicts are too complex to solve in the web editor. It suggest using the command line to resolve conflicts before continuing.
It says the conflicts are too complex to solve in the web editor. It suggest using the command line to resolve conflicts before continuing.
@acocac ok I fixed it
Renames the model and data config files as per the defaults expected by scivision