fix merge conflict

7 years ago · 4e02c71bdf
parent d331af9e32
commit 4e02c71bdf
1 changed files with 0 additions and 4 deletions
--- a/site/package.json
+++ b/site/package.json
@ -53,10 +53,6 @@
    "rollup-plugin-svelte": "^5.0.3",
    "rollup-plugin-terser": "^4.0.4",
    "sapper": "^0.26.0-alpha.10",
-<<<<<<< HEAD
    "svelte": "^3.0.0-beta.10"
-=======
-    "svelte": "^3.0.0-beta.8"
->>>>>>> master
  }
 }