Skip to content

Commit

Permalink
force a fail
Browse files Browse the repository at this point in the history
  • Loading branch information
bollwyvl committed Dec 15, 2023
1 parent 3f9d532 commit 1022914
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions jupyak_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ merge_with = [

[repos.jupyterlite.github]
# (un)comment the below to (un)break the build
merge_strategy = "ort"
merge_options = ["theirs"]
# merge_strategy = "ort"
# merge_options = ["theirs"]
merge_with = [
"pull/1263",
]
Expand Down

0 comments on commit 1022914

Please sign in to comment.