Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git remote add singhbit/tapis https://bitbucket.org/singhbit/tapis.git
git fetch singhbit/tapis
git merge --no-ff -m 'Merged in singhbit/tapis/singhbit/alignpacbiopy-edited-online-with-bitbuck-1505337055539 (pull request #1)' remotes/singhbit/tapis/singhbit/alignpacbiopy-edited-online-with-bitbuck-1505337055539
alignPacBio.py edited online with Bitbucket
'cat' was causing error on run. changed to 'cat ' (space before end quote)