conflict fixed

282ee8d8 · luji34 · f077622e · 61e195cf · 282ee8d8
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

readme.txt readme.txt +1 -1

未找到文件。
--- a/readme.txt
+++ b/readme.txt
 1
 2
-Creating a new branch is quick & simple.
\ No newline at end of file
+Creating a new branch is quick and simple.