Skip to content

Commit

Permalink
Conflicts resolve
Browse files Browse the repository at this point in the history
  • Loading branch information
@Koo-EunSung
Koo-EunSung committed Oct 5, 2024
2 parents 3ab7d63 + e6c1b91 commit dfcce8b
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion branchText.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
main branch에서 생성
main branch에서 생성
test-branch2 에서 생성

0 comments on commit dfcce8b

Please sign in to comment.