EmiDt / symphostage

1 stars 1 forks source link

Sylvain - 20 mars 2018 #4

Closed sylvainschmitt closed 6 years ago

sylvainschmitt commented 6 years ago

You can either merge with git the new changes or only add them one by one manually in your code and then reject the pull request. If you don't get something open a discussion on the change with the review tool.

Here are the changes:

Sylvain 20 mars 2018

sylvainschmitt commented 6 years ago

I corrected the conflict between your changes and my pull request. If you did new changes locally, first push them on GitHub, then I will resolve conflicts and merge version myself, like that it will be easier to get changes my changes.

sylvainschmitt commented 6 years ago

You approved ! Perfect, you can close the pull request now.