Second commit for conflict

2021-10-23 12:17:19 -04:00 · 2021-10-23 12:17:19 -04:00 · 9d6af11683
commit 9d6af11683
parent e3bf97c1ca
1 changed files with 1 additions and 1 deletions
--- a/e.txt
+++ b/e.txt
@ -1,3 +1,3 @@
 e
-Minor change
+Minor Change