1
0
Fork 0
mirror of https://gitlab.com/xmpp-rs/xmpp-rs.git synced 2024-07-12 22:21:53 +00:00

Remove left-out conflict marker.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2019-09-13 01:38:45 +02:00
parent 289437d5b3
commit 679aa4b821

View file

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