Skip to content
Snippets Groups Projects
Commit 39231c27 authored by 정 재윤's avatar 정 재윤
Browse files

brA:merge conflict resolve

parents cc4d7f0c f26d3ba7
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
lab1122/note.md
+ 2
− 0
View file @ 39231c27
1122 note 1122 note
## main : write in the main branch
## brA: write in the brA branch ## brA: write in the brA branch
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr