add master conflict test

mirror of https://github.com/Developer-Y/cs-video-courses.git
2 years ago · 99631160fd
parent 14064a82bf
commit 99631160fd
1 changed files with 1 additions and 1 deletions
--- a/README.md
+++ b/README.md
@ -1,4 +1,4 @@
-# This is a test for push action in git!
+# This is second test for conflict! v2.0
 This is second commit!
`@ -1,4 +1,4 @@`
	`# This is a test for push action in git!`	`# This is second test for conflict! v2.0`

	`This is second commit!`	`This is second commit!`