Skip to content

bundeli, algesia (logical-conflict) #149274

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
pv72895 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

bundeli, algesia (logical-conflict) #149274

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/alpha/alpha.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,6 @@ audioemission
apprentice
adtevac
apochromatic
algesia
anecdotes
abraded
antidynastical
Expand Down Expand Up @@ -17865,6 +17864,7 @@ adherently
arri
adenoacanthoma
acquaintanceship
algesia
arabize
accismus
autosuggestible
Expand Down
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 @@ -171,7 +171,6 @@ birthy
blameful
biocycle
buddhist
bundeli
bullyragger
bashara
bruises
Expand Down Expand Up @@ -13705,6 +13704,7 @@ branding
bleareyed
bucolical
berggylt
bundeli
beehouse
beamish
buyout
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