diff --git a/readme.txt b/readme.txt index e256516..47de9e1 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,7 @@ //1.git版本库,把文件添加到版本库 第一次修改 -合并分之冲突解决 \ No newline at end of file + +合并分之冲突解决 + +hello git