do over trying to create a merge conflict

rithmschool / elevate

Human resources for the employee.

0 stars 0 forks source link

Closed stephaniesimms closed 5 years ago

stephaniesimms commented 5 years ago

we added a comment to our file to create a merge conflict, but it doesn't appear to have the expected outcome..?