merge

philhawksworth · Aug 23, 2018 · d940bc0 · d940bc0
1 parent 2ae8764
commit d940bc0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -17,11 +17,7 @@
     "url": "https://github.com/philhawksworth/eleventyone"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@11ty/eleventy": "^0.5.2",
-=======
-    "@11ty/eleventy": "^0.5.0",
->>>>>>> ddabbc755015a79ae4bf5f25cca4195852cbd95d
     "concurrent-transform": "^1.0.0",
     "gravatar": "^1.6.0",
     "gulp": "^4.0.0",