Merge remote-tracking branch 'origin/try-lite-1263' into try-lite-1263

deathbeds · Dec 15, 2023 · eaf2913 · eaf2913
2 parents 04bc3f6 + 3f28c73
commit eaf2913
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/jupyak_config.toml b/jupyak_config.toml
@@ -9,8 +9,9 @@ merge_with = [
 ]
 
 [repos.jupyterlite.github]
-merge_strategy = "ort"
-merge_options = ["theirs"]
+# restore to un-break the build
+# merge_strategy = "ort"
+# merge_options = ["theirs"]
 merge_with = [
   "pull/1263",
 ]