fix conflict

f83844e0 · davidlee · 99f78562 · d073efcb · f83844e0
Commit f83844e0 authored Feb 10, 2025 by davidlee
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

test.txt test.txt +2 -1

No files found.
--- a/test.txt
+++ b/test.txt
-hello world!
\ No newline at end of file
+hello world!
+what a perfect day!
\ No newline at end of file