Skip to content

bactritoid, carburise (logical-conflict) #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
EliSchleifer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bactritoid, carburise (logical-conflict) #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bazel/bravo/bravo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13476,6 +13476,7 @@ balloon
berk
bloodguiltless
buyback
bactritoid
biographer
believeth
baggage
Expand Down Expand Up @@ -13939,7 +13940,6 @@ bowstring
bacteriotropic
binoculate
bowstringed
bactritoid
birdmen
behavior
bowtell
Expand Down
2 changes: 1 addition & 1 deletion bazel/charlie/charlie.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4170,7 +4170,6 @@ carbamido
carnet
chiron
carabideous
carburise
cardsharp
cardsharping
chlorites
Expand Down Expand Up @@ -5798,6 +5797,7 @@ catella
conferruminate
catena
catenae
carburise
catenane
cremates
catenarian
Expand Down
1 change: 1 addition & 0 deletions logical-conflict.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
simulate logical merge conflict