Closed clinique closed 8 years ago
There are merge conflicts. Could you rebase against upstream/master? Also next time, you should do your changes in a branch.
Yes, sorry, I did it a bit quick and dirty ! Will do it once again cleaner :)
There are merge conflicts. Could you rebase against upstream/master? Also next time, you should do your changes in a branch.