conflict resolution

joelcarrier · Oct 13, 2016 · ceea0bf · ceea0bf
2 parents 52694c6 + cd5778f
commit ceea0bf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "deep-equal": "~1.0.1",
     "eventemitter3": "~2.0.1",
     "extend": "~3.0.0",
-    "parchment": "1.0.1",
+    "parchment": "1.0.2",
     "quill-delta": "3.2.0"
   },
   "devDependencies": {