Merge branch 'dnew' - fixed conflict manually in 'vim'

2021-10-23 12:21:34 -04:00 · 2021-10-23 12:21:34 -04:00 · e0fff7d62e
commit e0fff7d62e
parent 9d6af11683 5171313fd6
2 changed files with 3 additions and 1 deletions
--- a/dan.txt
+++ b/dan.txt
@ -1 +1,3 @@
 this is a new file only in my branch
 changing something that won't conflict in master
--- a/e.txt
+++ b/e.txt
@ -1,3 +1,3 @@
 e
-Minor Change
+MiNor Change
`@ -1 +1,3 @@`
	`this is a new file only in my branch`	`this is a new file only in my branch`

		`changing something that won't conflict in master`