From db0c0cc723c4948d469abad4024435e474d141be Mon Sep 17 00:00:00 2001 From: Reynald Affeldt Date: Fri, 25 Jun 2021 15:07:29 +0900 Subject: [PATCH] fix --- index.md | 2 +- meta.yml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/index.md b/index.md index d17c15de..64e226c9 100644 --- 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 index af3a4a63..d5e69197 100644 --- 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: