Skip to content
Snippets Groups Projects
Commit f556603a authored by KimJeongwook's avatar KimJeongwook
Browse files

Merge branch 'branch2' into 'master' 

Update hello.txt



See merge request !2
parents 0d5ee14a 9dc12d37
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
hello.txt
+ 1
− 0
View file @ f556603a
......@@ -4,3 +4,4 @@ in git
=======
web
>>>>>>> 53ed6f61209f7d77b77b3d2df0704090117fcc3b
i'm branch2
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