Closed will-moore closed 4 years ago
Conflicting PR. Removed from build OMERO-plugins-push#116. See the console output for more details. Possible conflicts:
--conflicts Conflict resolved in build OMERO-plugins-push#130. See the console output for more details.
Conflicting PR. Removed from build OMERO-plugins-push#117. See the console output for more details. Possible conflicts:
--conflicts Conflict resolved in build OMERO-plugins-push#131. See the console output for more details.
Conflicting PR. Removed from build OMERO-plugins-push#118. See the console output for more details. Possible conflicts:
--conflicts Conflict resolved in build OMERO-plugins-push#132. See the console output for more details.
@will-moore : are you for getting this in before the conflicting PR? I'd say this is good to go based solely on the travis testing.
Yes please, go ahead and merge. I don't think I need the conflicting changes from #343 anyway. They were only to try alternatives for uploading the scripts, but that is failing due to unicode issues regardless.
Conflicting PR. Removed from build OMERO-plugins-push#119. See the console output for more details. Possible conflicts:
--conflicts Conflict resolved in build OMERO-plugins-push#133. See the console output for more details.
Ported from https://github.com/ome/omero-figure/pull/351/commits/d5cddb0f4e6d3882edd9d70629ca406d86a0cb48
That commit was removed from #351 and wasn't needed to get travis passing, maybe due to other fixes elsewhere. But perhaps we still want some of these changes?