diff --git a/README.md b/README.md index 2813b2c6c2dc6d9d9af06d669edf338fe58b4196..c7cbdd3e01018ca4abca5e100ecd728520420edd 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ This will also cause a conflict. ======= This will cause a conflict. >>>>>>> conflict-branch +Change from another machine