From ccced83b0ebd9e4ade40e2afd461a20ee1dd439b Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 17 Sep 2018 17:44:29 -0700
Subject: [PATCH] Fixup merge mistake

---
 src/closure.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/closure.rs b/src/closure.rs
index 10b045d0..ddee882f 100644
--- a/src/closure.rs
+++ b/src/closure.rs
@@ -3,11 +3,6 @@
 //! This module defines the `Closure` type which is used to pass "owned
 //! closures" from Rust to JS. Some more details can be found on the `Closure`
 //! type itself.
-<<<<<<< a37fa45100baddc36695cbf01110bcd9ab638065
-=======
-//!
-//! The `nightly` feature is required for the `Closure` type to be used.
->>>>>>> Tweak more `Closure` docs
 
 use std::cell::UnsafeCell;
 #[cfg(feature = "nightly")]