[GitHub] incubator-taverna-language pull request: Iwir json

2015-06-17 Thread menaka121
GitHub user menaka121 opened a pull request: https://github.com/apache/incubator-taverna-language/pull/2 Iwir json Added the support to convert scufl workflows into .iwir and .json formats. Please review and merge. Thank you You can merge this pull request into a Git

[GitHub] incubator-taverna-language pull request: Iwir json

2015-06-17 Thread stain
Github user stain commented on the pull request: https://github.com/apache/incubator-taverna-language/pull/2#issuecomment-112598857 Could you resolve the merge conflict first? You will need to do something like: ``` git remote add upstream