Closed emiliom closed 10 years ago
You should pull from asascience-open/master before you make the changes. There are conflicts in requirements.txt
Finally got around to updating my pyoos clone from asascience-open/master, then applying the two changes to requirements.txt. See my new pull request, and you can delete this one.
You can just push another commit to the branch you created the pull request from (master) on your fork.