Skip to content

aplanatic, ghatti (logical-conflict) #6408

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

Closed
EliSchleifer wants to merge 1 commit into from
Closed

aplanatic, ghatti (logical-conflict) #6408

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 @@ -934,6 +934,7 @@ antiopium
apostrophi
absolutist
absolutize
aplanatic
absolutory
acanthopteri
absolvatory
Expand Down Expand Up @@ -16952,7 +16953,6 @@ aftertan
affectedness
angliae
amphorette
aplanatic
aplanatism
ately
airways
Expand Down
2 changes: 1 addition & 1 deletion bazel/golf/golf.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,6 @@ gadis
galactan
glove
guily
ghatti
gymnophiona
guerrilla
gametangia
Expand Down Expand Up @@ -964,6 +963,7 @@ glottogony
gamp
graysby
gastrolobium
ghatti
galliferous
gilgamesh
grouting
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