Closed taguhiM closed 2 years ago
The conflict in docs/protos.html is happening because your fork is not up to date with our origin/master. Update the fork, pull locally and push again and it should be fine
Yeah, sorry, didn't notice that. Should be fine now.
Sorry folks, I've been very busy. I will review this by tomorrow.
To wrap it up, the changes are: