I have no idea why this can't be merged. I have done a merge with origin/develop twice, and the second one told me that everything was up-to-date. Oddly, the thing that it thinks was a problem was scripts.py that seemed to be almost blank in the nimaid version. Not sure what's going on there.
I have no idea why this can't be merged. I have done a merge with origin/develop twice, and the second one told me that everything was up-to-date. Oddly, the thing that it thinks was a problem was scripts.py that seemed to be almost blank in the nimaid version. Not sure what's going on there.