Remove left-out conflict marker.

Maxime “pep” Buquet created 6 years ago

Signed-off-by: Maxime “pep” Buquet <[e-mail]>

Change summary

src/lib.rs | 1 -
1 file changed, 1 deletion(-)

Detailed changes

src/lib.rs

@@ -379,4 +379,3 @@ impl Agent {
             .unwrap();
     }
 }
->>>>>>> lm-master