Update test-suite (the change seems legit)

pitag-ha · Mar 1, 2024 · d81d878 · d81d878
1 parent 2984251
commit d81d878
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -11,19 +11,9 @@ Since **merl-an** streamlines Merlin's main trunk, we recommend building a local
 switch and manually adding the dependency to Merlin:
 
 ```shell
-<<<<<<< HEAD
 opam update
 opam switch create . --deps-only --with-doc --with-test --with-dev-setup -y
 eval $(opam env)
 dune build
-=======
-# opam update
-# opam switch create --empty . --deps-only -y
-# eval $(opam env)
-
-# opam pin add https://github.com/ocaml/merlin.git
-# opam install . --deps-only --with-doc --with-test --with-dev-setup -y
-# dune build
->>>>>>> 7e6b5dd (Add README and LICENSE)
 ```