DImuthuUpe commented on pull request #11: URL: https://github.com/apache/airavata-mft/pull/11#issuecomment-625880984
@aniruddhavpatil there are merge conflict. Have a look at the message below. You might have to rebase it locally <img width="691" alt="Screen Shot 2020-05-08 at 11 48 51 AM" src="https://user-images.githubusercontent.com/1346332/81423055-e4651700-9121-11ea-8bfa-f3873200de3e.png";> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
![https://user-images.githubusercontent.com/1346332/81423055-e4651700-9121-11ea-8bfa-f3873200de3e.png"](https://user-images.githubusercontent.com/1346332/81423055-e4651700-9121-11ea-8bfa-f3873200de3e.png"){kind=link}