Whoops. Add a `FromStr` impl for `ReactionType`

1 files changed, 0 insertions, 6 deletions

diff --git a/src/builder/create_embed.rs b/src/builder/create_embed.rs
index 7c4d3d6..7a19ba7 100644
--- a/src/builder/create_embed.rs
+++ b/src/builder/create_embed.rs
@@ -235,15 +235,9 @@ impl CreateEmbed {
     /// struct Handler;
     ///
     /// impl EventHandler for Handler {
-<<<<<<< HEAD
-    ///     fn guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) {
-    ///         use serenity::client::CACHE;
-    ///         let cache = CACHE.read();
-=======
     ///     fn on_guild_member_addition(&self, _: Context, guild_id: GuildId, member: Member) {
     ///         use serenity::CACHE;
     ///         let cache = CACHE.read().unwrap();
->>>>>>> v0.4.3
     ///
     ///         if let Some(guild) = cache.guild(guild_id) {
     ///             let guild = guild.read();