From f9f3a9ee15d1bd04cabc9fce5b27cc157b078e87 Mon Sep 17 00:00:00 2001 From: Jerry Huang <jh4248@drexel.edu> Date: Tue, 3 Dec 2024 19:16:04 -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 c00c4d6..5e895ab 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # Git Laboratory This is a feature branch. +This will cause a conflict -- GitLab