From b5a00b7f4306f5222d5beee26ec50da3ad433259 Mon Sep 17 00:00:00 2001
From: Shan Carter <shanjcarter@gmail.com>
Date: Tue, 21 Nov 2017 14:56:16 -0800
Subject: [PATCH] Fixing wrong/old version number

---
 package-lock.json | 2 +-
 package.json      | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d8c7599..e78f50b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "distill-template",
-  "version": "2.2.11",
+  "version": "2.2.12",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index de8f773..c5777b7 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "distill-template",
-<<<<<<< HEAD
-  "version": "2.2.11",
-=======
   "version": "2.2.12",
->>>>>>> be585691c53c0f06db2b6dd0f218905825bc57ae
   "description": "Template for creating Distill articles.",
   "main": "dist/template.v2.js",
   "bin": {