diff --git a/README.md b/README.md index 6ad6d6ffba6d93e53a44633095c35edbb8e5f31f..4f0ed9ec9a373e3befd879fd215dd3a50960cc0b 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ This is a feature branch. This will also cause a conflict. This will cause a conflict. +Change from another machine