From ec976bc64ab166c8277ea98b2f750f489f7fd861 Mon Sep 17 00:00:00 2001 From: Bryant Lin <bpl62@drexel.edu> Date: Sun, 1 Dec 2024 21:16:36 -0500 Subject: [PATCH] Change README on conflict-branch --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c05e35e..35dd5b4 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # Git Laboratory some changes +This will cause a conflict. -- GitLab