From b99b892baf62c1bc7c310af2702fd1327017a963 Mon Sep 17 00:00:00 2001 From: dswiger Date: Sat, 23 Oct 2021 12:16:06 -0400 Subject: [PATCH] First change for conflict. --- e.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e.txt b/e.txt index 7a2319a..87bfc3c 100644 --- a/e.txt +++ b/e.txt @@ -1,3 +1,3 @@ e -Minor change +MiNor change