Remove left-out conflict marker.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
2019-09-13 01:38:45 +02:00 · 2019-09-13 01:38:45 +02:00 · 679aa4b821
commit 679aa4b821
parent 289437d5b3
1 changed files with 0 additions and 1 deletions
--- a/src/lib.rs
+++ b/src/lib.rs
@ -379,4 +379,3 @@ impl Agent {
            .unwrap();
    }
 }
->>>>>>> lm-master