@@ -54,10 +54,6 @@
"prop-types": "^15.5.10",
"react": "^15.4.1",
"react-dom": "^15.4.1",
-<<<<<<< HEAD
- "react-lz-editor": "^0.10.18"
-=======
"react-quill": "^1.0.0"
->>>>>>> 027d554e638e44579e222655436c66d7d1f76057
}