From 0d167522f46a5845b1d9bb7b275da332c8a92860 Mon Sep 17 00:00:00 2001
From: Ned Zimmerman <ned@bight.ca>
Date: Tue, 27 Nov 2018 14:20:15 -0400
Subject: [PATCH] Update package.json

---
 package.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/package.json b/package.json
index d56d7c0..e44d662 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,6 @@
 {
 	"name": "@pressbooks/pressbooks-aldine",
-<<<<<<< HEAD
-
-	"version": "1.2.1",
-=======
 	"version": "1.5.0",
->>>>>>> dev
 	"author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>",
 	"homepage": "https://github.com/pressbooks/pressbooks-aldine/",
 	"description":