From 1b6243828d12158f7d5097e95500be445d6084be Mon Sep 17 00:00:00 2001
From: Robbert Krebbers <mail@robbertkrebbers.nl>
Date: Fri, 7 Apr 2017 21:23:38 +0200
Subject: [PATCH] Oops, fix previous commit.

---
 opam.pins | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/opam.pins b/opam.pins
index 7c7f47e2..15d94cd4 100644
--- a/opam.pins
+++ b/opam.pins
@@ -1,5 +1 @@
-<<<<<<< HEAD
 coq-iris https://gitlab.mpi-sws.org/FP/iris-coq f987ca782d1301d319cf6c4ba8e2ab449ebe903a
-=======
-coq-iris https://gitlab.mpi-sws.org/FP/iris-coq 56f0afb23dc761c9a822a505d6d7d2cc435b681b
->>>>>>> 937f5230a0c0c9ef3f3cd87330fc210a2ca7ab11
-- 
GitLab