From 4e02c71bdfb7e2b907aea37851358370c5964cb2 Mon Sep 17 00:00:00 2001
From: Richard Harris <richard.a.harris@gmail.com>
Date: Sat, 2 Mar 2019 14:07:05 -0500
Subject: [PATCH] fix merge conflict

---
 site/package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/site/package.json b/site/package.json
index fe3cf9e65f..605682db32 100644
--- 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
   }
 }