Closed AmoDinho closed 7 years ago
I have tried to merge our two branches manually.
Not successful :dagger:
So will do the following: Will use git to attempt to merge the changes automatically.