merge conflict

github11218 · github11218 · commit 09153d7c6ec2 · 2022-10-10T14:44:08.000+05:30
diff --git a/m.txt b/m.txt
@@ -1,2 +1,2 @@
-Good Morning! This could be a window server
+Good Evning !This could be a window server
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-Good Morning! This could be a window server`
	`1`	`+Good Evning !This could be a window server`
`2`	`2`