Skip to content

adamant, diploid (logical-conflict) #152902

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

adamant, diploid (logical-conflict) #152902

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 @@ -6462,6 +6462,7 @@ antoecians
ankylosaurus
applaudably
angolar
adamant
atoned
abated
antecornu
Expand Down Expand Up @@ -18563,7 +18564,6 @@ authoritativeness
africanization
algum
antiegoistically
adamant
alcahests
acronychally
ashkenazim
Expand Down
2 changes: 1 addition & 1 deletion bazel/delta/delta.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1324,7 +1324,6 @@ dividuous
dogies
diencephalon
doubles
diploid
devanagari
dimity
debitrix
Expand Down Expand Up @@ -17005,6 +17004,7 @@ dullard
dyads
drearness
dystocias
diploid
disbury
diadokokinesis
decadation
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