From ac8b70aea44eea9ccde336fa6f6d623b97712e15 Mon Sep 17 00:00:00 2001 From: Brian Ho Date: Wed, 11 Jan 2023 10:52:23 -0800 Subject: [PATCH 1/2] added line --- file1.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/file1.txt b/file1.txt index 140926d..d168901 100644 --- a/file1.txt +++ b/file1.txt @@ -1,3 +1,4 @@ Welcome to INFO 442 Week 2. Merge conflicts are annoying. -Hopefully rebasing can help in collaboration! \ No newline at end of file +Hopefully rebasing can help in collaboration! +I love INFO 442! \ No newline at end of file From 8c2e9bc549ae13234281f59506a5e1b59865cb38 Mon Sep 17 00:00:00 2001 From: Brian Ho Date: Wed, 11 Jan 2023 10:55:17 -0800 Subject: [PATCH 2/2] add line 4 --- file1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/file1.txt b/file1.txt index d168901..c11d3f6 100644 --- a/file1.txt +++ b/file1.txt @@ -1,4 +1,4 @@ Welcome to INFO 442 Week 2. Merge conflicts are annoying. Hopefully rebasing can help in collaboration! -I love INFO 442! \ No newline at end of file +I love INFO 442! :) \ No newline at end of file