danielbachhuber/Edit-Flow — comment on commit 4e440237f7a08e47f26a45a93211066885e503f0
File:  line 0
By sbressler:

I changed this line: https://github.com/danielbachhuber/Edit-Flow/commit/4e440237f7a08e47f26a45a93211066885e503f0#L2R259 before pulling, so I had a merge conflict. I fixed the merge conflict and then committed.