瀏覽代碼

conflict fixed

admin 3 年之前
父節點
當前提交
c869e1b800
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      readme.txt

+ 1 - 1
readme.txt

@@ -2,5 +2,5 @@ Git is a distributed version control system.
 Git is free softwarei distributed under the GPL.
 Git has a mutable index called stage.
 Git tracks changes of files.
-Creating a new branch is quick & simple.
+Creating a new branch is quick and simple.