From 78a5e65b163e96bac7debc890ff27991260f010f Mon Sep 17 00:00:00 2001 From: Tony Fast Date: Tue, 16 Jan 2024 16:20:44 -0800 Subject: [PATCH] Update jupyak_config.toml update configuration based on https://github.com/t03857785/jupyterlab/issues/12 --- jupyak_config.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jupyak_config.toml b/jupyak_config.toml index 46865c6..6afb3b9 100644 --- a/jupyak_config.toml +++ b/jupyak_config.toml @@ -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" ]