Fix merge error
Sorry about that, I think I gotfor to `git add` the file before completing the merge
parent
64ff880c
Please register or sign in to comment
Sorry about that, I think I gotfor to `git add` the file before completing the merge