Lee.J.H / git_advanced_2

Go to a project
Toggle navigation Toggle navigation pinning
Lee.J.H
ebf9aac3 1 parent 10132737

sixth

Inline Side-by-side
Showing 1 changed file with 5 additions and 0 deletions
1 mod ver2 1 mod ver2
2 <<<<<<< HEAD 2 <<<<<<< HEAD
3 +<<<<<<< HEAD
3 mod ver3 4 mod ver3
4 mod ver4 5 mod ver4
5 ======= 6 =======
6 mod ver5 7 mod ver5
7 >>>>>>> 7a0b4e1 (fifth) 8 >>>>>>> 7a0b4e1 (fifth)
9 +=======
10 +mod ver5
11 +mod ver6
12 +>>>>>>> dd8cdcd (sixth)
......