diff --git a/README.md b/README.md index 73958e1e0f6484c8299477478d7799830eafdf19..1f5211e8b549d1ee3e46cdba409d5708f4627f3d 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,4 @@ This will cause a conflict. >>>>>>> conflict-branch Staged change Remote branch change +Change from another machine