Merged PR with word conflict (#76)

fregante · web-flow · commit 96451b68751d · 2023-11-30T16:51:47.000+08:00
diff --git a/renamed and edited.file.md b/renamed and edited.file.md
@@ -1,3 +1,4 @@
 or you can create a file with the issue/pr number
 
 
+

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`or you can create a file with the issue/pr number`
`2`	`2`
`3`	`3`
	`4`	`+`