v2.1

hhugo · hhugo · commit 577e91415c37 · 2014-04-28T19:02:03.000+02:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0
+2.1
diff --git a/opam/opam b/opam/opam
@@ -9,7 +9,9 @@ remove: [
 ]
 depends: [
   "ocamlfind"
-  "deriving" {>= "9999"}
   "lwt" {>= "2.4"}
   "menhir"
 ]
+
+depopts: ["deriving"]
+conflicts: ["deriving" {< "0.6"}]
