From f5f9e7b1d64cf85858ab2d5971c43aff10a1f0c9 Mon Sep 17 00:00:00 2001 From: Bryant Lin <bpl62@drexel.edu> Date: Sun, 1 Dec 2024 21:36:53 -0500 Subject: [PATCH] Update README on remote-branch --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c73e85f..73958e1 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ This will also cause a conflict. ======= This will cause a conflict. >>>>>>> conflict-branch +Staged change +Remote branch change -- GitLab