fix: broken file

antvis · Nov 25, 2022 · d6df2d5 · d6df2d5
1 parent 2731023
commit d6df2d5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/packages/x6-plugin-clipboard/package.json b/packages/x6-plugin-clipboard/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@antv/x6-plugin-clipboard",
-<<<<<<< HEAD
-  "version": "2.1.1",
-=======
   "version": "2.1.2",
->>>>>>> master
   "description": "clipboard plugin for X6",
   "main": "lib/index.js",
   "module": "es/index.js",