Skip to content
This repository was archived by the owner on May 25, 2021. It is now read-only.

Conversation

@jairo-campos-JD
Copy link
Contributor

@jairo-campos-JD jairo-campos-JD commented May 27, 2019

With user changes: http://recordit.co/2orxASzR4L
WithOut user changes: http://recordit.co/xSK6D7VUbc

@james-martin-jd james-martin-jd merged commit c3462b6 into develop May 30, 2019
@NSeydoux NSeydoux deleted the feature/conflict-resolution branch May 20, 2020 07:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants