From 9caf5cb735ceb149d0c2f43120ec6cc0caf55dc7 Mon Sep 17 00:00:00 2001 From: Fawwaz Hussain <fh377@drexel.edu> Date: Sat, 15 Mar 2025 16:24:46 -0400 Subject: [PATCH] Change README on master --- 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