Fakultas Ilmu Komputer UI

Skip to content
Snippets Groups Projects
Commit aa45c8e5 authored by Hilmi Al-Biruni's avatar Hilmi Al-Biruni
Browse files

solve rebase.txt conflict

parent 984a8dfa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 1 deletion
tutorial-6/rebase.txt
+ 7
− 1
View file @ aa45c8e5
this is text from branch rebase-1
1234567890
\ No newline at end of file
1234567890
this is text from branch rebase-2
abcdefghijklm
>>>>>>> 1d0f740 (add rebase file on rebase-2)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Excellence In Teamwork