From 80ae274d56db6c19c719300fb60db33f389640dc Mon Sep 17 00:00:00 2001 From: Edric Tang <emt94@drexel.edu> Date: Tue, 3 Dec 2024 23:32:33 -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 b5eff81..51af196 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # Git Laboratory This is a feature branch. +This will cause a conflict. -- GitLab