remove HEAD tag from rebase

enzymejs · Dec 24, 2015 · 3bf0b5b · 3bf0b5b
1 parent 814c89c
commit 3bf0b5b
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/src/__tests__/ReactWrapper-spec.js b/src/__tests__/ReactWrapper-spec.js
@@ -1213,21 +1213,6 @@ describeWithDOM('mount', () => {
         `<div class="in-foo"></div>`
       );
     });
-<<<<<<< HEAD
-=======
-
-    it('should remove all data-react attributes from anywhere in the HTML', () => {
-      const wrapper = mount(
-        <div data-react-props="begone" data-react-class="begone" className="test">
-          <span>Hello World!</span>
-        </div>
-      );
-      expect(wrapper.html()).to.equal(
-        `<div class="test"><span>Hello World!</span></div>`
-      );
-    });
-
->>>>>>> Makes regex more robust in html() based on review feedback
   });
 
 });