瀏覽代碼

Merge pull request #9 from htwg-syslab-bsys-ws17/manuelVo-patch-1

Fix errors in hw0 that occured during the presentation
Stefan Junker 8 年之前
父節點
當前提交
3e9afdb78a
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2
    2
      hw0/gittask0/README.md

+ 2
- 2
hw0/gittask0/README.md 查看文件

@@ -51,12 +51,12 @@ git push
51 51
 * Erstelle einen Pull-Request von _hw0-UserB_ auf _hw0_.
52 52
   **Konflikt tritt auf!**
53 53
 
54
-### User A @ Container
54
+### User B @ Container
55 55
 ```bash
56 56
 git checkout hw0
57 57
 git pull
58 58
 git checkout hw0-UserB
59
-git merge hw0-UserA
59
+git merge hw0
60 60
 # edit SOLUTIONS.md
61 61
 git commit -v SOLUTIONS.md
62 62
 git push

Loading…
取消
儲存