Resolve conflict markup left

hiwelo · hiwelo · commit 7879dbc596cd · 2019-06-22T23:47:31.000+02:00
diff --git a/src/index.js b/src/index.js
@@ -34,9 +34,6 @@ export {
   toBeRequired,
   toBeInvalid,
   toBeValid,
-<<<<<<< HEAD
   toHaveValue,
-=======
   toBeLabelled,
->>>>>>> Implement .toBeLabelled and a series of basic tests
 }
