Keats: resolved svn conflict, did a couple of releases, discussed future plans Posted by mholmes on 08 Jun 2018 in Academic The problem conflict file in svn is now fixed (svn resolve [file] --accept theirs-full) and we have a good idea of where we're going after a discussion. This entry was posted by Martin and filed under Academic.
