Merge pull request 'merge' (#5 ) from dev into master

confict
3 changed files with 1 additions and 0 deletions
--- a/123.txt
+++ b/123.txt
@ -0,0 +1 @@
+123
--- a/model/test.txt
+++ b/model/test.txt
--- a/other/1.txt
+++ b/other/1.txt
Author	SHA1	Message	Date
pzo9jb4e6	8d071c4cf6	Merge pull request 'merge' (#5 ) from dev into master	3 years ago
pzo9jb4e6	e48b3bedea	confict	3 years ago