fix

affeldt-aist · Jun 25, 2021 · db0c0cc · db0c0cc
1 parent a5b52f4
commit db0c0cc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/index.md b/index.md
@@ -36,7 +36,7 @@ Related publications, if any, are listed below.
 
 - [A hierarchy of monadic effects for program verification using equational reasoning](https://staff.aist.go.jp/reynald.affeldt/documents/monae.pdf) doi:[10.1007/978-3-030-33636-3_9](https://doi.org/10.1007/978-3-030-33636-3_9)
 - [A Trustful Monad for Axiomatic Reasoning with Probability and Nondeterminism](https://arxiv.org/abs/2003.09993) 
-- [Extending Equational Monadic Reasoning with Monad Transformers](https://arxiv.org/abs/2011.03463) 
+- [Extending Equational Monadic Reasoning with Monad Transformers](https://drops.dagstuhl.de/opus/volltexte/2021/13881/) doi:[10.4230/LIPIcs.TYPES.2020.2](https://doi.org/10.4230/LIPIcs.TYPES.2020.2)
 
 ## Help and contact
 

diff --git a/meta.yml b/meta.yml
@@ -68,11 +68,7 @@ dependencies:
     [MathComp field](https://math-comp.github.io)
 - opam:
     name: coq-mathcomp-analysis
-<<<<<<< HEAD
     version: '{ (= "0.3.7") | (>= "0.3.9" & < "0.4~") }'
-=======
-    version: '{ (= "0.3.7") | ((<= "0.3.9") & (< "0.4~")) }'
->>>>>>> fix deps
   description: |-
     [MathComp analysis](https://github.com/math-comp/analysis)
 - opam: