diff --git a/README.md b/README.md index 2070c8316..04bd09f33 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # GoogleTest -This is an update from the main branch. +This is an update from both main and conflict-demo branches.