diff --git a/bazel/echo/echo.txt b/bazel/echo/echo.txt index 43219e435..dd7f2c961 100644 --- a/bazel/echo/echo.txt +++ b/bazel/echo/echo.txt @@ -3173,6 +3173,7 @@ ethanedial else esteeming evacuee +endrudge electioneers epaule elseways @@ -5391,7 +5392,6 @@ endowment excantation earthtongue endpoints -endrudge extrabulbar ecderonic endseal diff --git a/logical-conflict.txt b/logical-conflict.txt new file mode 100644 index 000000000..413acb3b1 --- /dev/null +++ b/logical-conflict.txt @@ -0,0 +1 @@ +simulate logical merge conflict \ No newline at end of file