conflict
aa
Merge branch 'master' of https://github.com/praline0/EgitTest.git
1a
a
Merge branch 'master' of https://github.com/praline0/EgitTest.git
c
conflict 해결
Merge branch 'master' of https://github.com/praline0/EgitTest.git
ignore