From 9faff8ba64c6312019b7cdef4c50f9cfd08c925f Mon Sep 17 00:00:00 2001 From: trunk bot Date: Thu, 4 Dec 2025 06:10:57 +0000 Subject: [PATCH] Moving words applosion, besmutch --- bazel/alpha/alpha.txt | 2 +- bazel/bravo/bravo.txt | 2 +- logical-conflict.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 logical-conflict.txt diff --git a/bazel/alpha/alpha.txt b/bazel/alpha/alpha.txt index d5762f1b788bf..e2e514f5a3615 100644 --- a/bazel/alpha/alpha.txt +++ b/bazel/alpha/alpha.txt @@ -6307,6 +6307,7 @@ accusatival alalunga achilary annerre +applosion anthropophagism aftergrief accorporate @@ -9300,7 +9301,6 @@ autogeny anticathode antienvironmentalism aitesis -applosion anilinism appetizing abounds diff --git a/bazel/bravo/bravo.txt b/bazel/bravo/bravo.txt index 72c3177f80e19..d525ed2f9fa17 100644 --- a/bazel/bravo/bravo.txt +++ b/bazel/bravo/bravo.txt @@ -859,7 +859,6 @@ bitter bellowsmaker bescrape barratrously -besmutch bilharzia bipinnaria babishness @@ -14144,6 +14143,7 @@ bedeswoman brimming ballies beshroud +besmutch bedaubing barkers bagatelle diff --git a/logical-conflict.txt b/logical-conflict.txt new file mode 100644 index 0000000000000..413acb3b12312 --- /dev/null +++ b/logical-conflict.txt @@ -0,0 +1 @@ +simulate logical merge conflict \ No newline at end of file