fix conflicts

2023-03-14 12:17:30 +08:00 · 2023-03-14 12:17:30 +08:00 · ec14f6d7fc
parent e7efc0a5eb 49031756f4
commit ec14f6d7fc
1 changed files with 1 additions and 0 deletions
--- a/readme.txt
+++ b/readme.txt
@ -3,4 +3,5 @@ test
 333
 666
 777
 888
 999
`@ -3,4 +3,5 @@ test`
	`333`	`333`
	`666`	`666`
	`777`	`777`
		`888`
	`999`	`999`