From aa45c8e563ecf3eaef44ef85ee97cf300542a85a Mon Sep 17 00:00:00 2001
From: Hilmi Al Biruni <hilmi.albiruni@ui.ac.id>
Date: Thu, 13 Oct 2022 19:05:12 +0700
Subject: [PATCH] solve rebase.txt conflict

---
 tutorial-6/rebase.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tutorial-6/rebase.txt b/tutorial-6/rebase.txt
index 0bfb963..39c5ae1 100644
--- a/tutorial-6/rebase.txt
+++ b/tutorial-6/rebase.txt
@@ -1,3 +1,9 @@
+
 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)
-- 
GitLab