Skip to content

Commit

Permalink
Update jupyak_config.toml
Browse files Browse the repository at this point in the history
update configuration based on  t03857785/jupyterlab#12
  • Loading branch information
tonyfast authored Jan 17, 2024
1 parent 17cc228 commit 78a5e65
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions jupyak_config.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[repos]
lumino.github.merge_with = [
lumino.github.merge_with = [
"pull/633",
"pull/637",
"pull/655",
"pull/666"
]

jupyterlab.github.merge_strategy = "ort"
jupyterlab.github.merge_options = ["theirs"]
jupyterlab.github.merge_with = [
"pull/14575",
"pull/14597",
"pull/14766",
"pull/14854",
"pull/15222",
"pull/15347",
"pull/15048",
"pull/15155",
"pull/15347",
"pull/15554"
]

0 comments on commit 78a5e65

Please sign in to comment.