/MergeConflict

A simple iOS application repository to demonstrate Git-Flow and handling Merge Conflicts.

MergeConflict

A simple iOS application repository to demonstrate Git-Flow and handling Merge Conflicts.

Taylor Add this line to my code