Merge pull request #20722 from ocaml/mseri-patch-3
js_of_ocaml-compiler: conflict with base-domains
Marcello Seri 3 years ago 458eb1ee ac94f85b
··· 27 27 conflicts: [ 28 28 "ocamlfind" {< "1.5.1"} 29 29 "js_of_ocaml" {< "3.0"} 30 30 + "base-domains" 30 31 ] 31 32 dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" 32 33 build: [