From e200686ef4233e1c62364ea6e5a5dedf81a915c4 Mon Sep 17 00:00:00 2001 From: Edric Tang <emt94@drexel.edu> Date: Tue, 3 Dec 2024 23:38:27 -0500 Subject: [PATCH] Change from another machine --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2813b2c..c7cbdd3 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ This will also cause a conflict. ======= This will cause a conflict. >>>>>>> conflict-branch +Change from another machine -- GitLab