From 679aa4b82198e6275575fd20bde2edfbf5840415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= <pep@bouah.net>
Date: Fri, 13 Sep 2019 01:38:45 +0200
Subject: [PATCH] Remove left-out conflict marker.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
---
 src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 91f32070..7731db56 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -379,4 +379,3 @@ impl Agent {
             .unwrap();
     }
 }
->>>>>>> lm-master