mirror of
https://github.com/google/googletest.git
synced 2025-04-04 21:15:03 +00:00
Resolved merge conflict in README.md
This commit is contained in:
commit
0095580bcc
1 changed files with 1 additions and 1 deletions
|
@ -1,2 +1,2 @@
|
|||
# GoogleTest
|
||||
This is an update from the main branch.
|
||||
This is an update from both main and conflict-demo branches.
|
||||
|
|
Loading…
Add table
Reference in a new issue