DevMech / MergeConflict

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

#Merge this. Ybhbuybuyou think jnjknyou can merge with me? I don't think so./ ##Break Stuff

This chabugynge was made by Ben.

hbhb おっしゃれ〜 ウップデットできるぜ。

書いてることが全然読まないからなんでも書いたらいいさdfkjghdkfjhgkjhdfg〜。