yee 7 years ago
parent
commit
aec2e6646f
1 changed files with 0 additions and 4 deletions
  1. 0 4
      package.json

+ 0 - 4
package.json

@@ -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
   }
 }