From cf709d75ae761bd7a85d0e8352c824f61b2df998 Mon Sep 17 00:00:00 2001 From: jstchw Date: Mon, 16 Mar 2026 17:46:37 +0700 Subject: [PATCH] Another rebase conflict commit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cd4ae14..b3e1d7c 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,6 @@ This will be a GIT local training repo. Good checkpoint -Conflicting line main specific \ No newline at end of file +Conflicting line main specific + +another conflicting line \ No newline at end of file