From 521a7bc6a360b9b6e95893123eada228725cce39 Mon Sep 17 00:00:00 2001
From: hhugo <hugo.heuzard@gmail.com>
Date: Tue, 30 Sep 2014 18:36:05 +0200
Subject: [PATCH] Update opam

---
 opam | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/opam b/opam
index 6a8ae54..0a35e28 100644
--- a/opam
+++ b/opam
@@ -15,6 +15,3 @@ depends: [
   "oasis" {>= "0.4.4"}
   "camlp4"
 ]
-conflicts: [
-  "batteries" {="2.3.0"}
-]