First change for conflict.

2021-10-23 12:16:06 -04:00 · 2021-10-23 12:16:06 -04:00 · b99b892baf
commit b99b892baf
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