From cc7be05204653993ffb2dd641586d27ad9fffbfe Mon Sep 17 00:00:00 2001 From: Edric Tang <emt94@drexel.edu> Date: Tue, 3 Dec 2024 23:33:06 -0500 Subject: [PATCH] Change README on main --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b5eff81..21bc1b8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # Git Laboratory This is a feature branch. +This will also cause a conflict. -- GitLab