From 7759777b575bf8f76c8160476b592ceddbb27168 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Wed, 4 Dec 2013 22:46:53 +0000
Subject: [PATCH] white space

---
 ep.json      | 2 --
 page_view.js | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/ep.json b/ep.json
index 6c5aa79..f2f45dd 100644
--- a/ep.json
+++ b/ep.json
@@ -25,5 +25,3 @@
     }
   ]
 }
-
-
diff --git a/page_view.js b/page_view.js
index 2333df6..e98f4c2 100644
--- a/page_view.js
+++ b/page_view.js
@@ -19,8 +19,3 @@ exports.eejsBlock_dd_insert = function (hook_name, args, cb){
 exports.eejsBlock_dd_view = function (hook_name, args, cb){
   args.content = args.content + "<li><a href='#' onClick='$(\"#options-pageview\").click();'>Page View</a></li>";
 }
-
-<<<<<<< HEAD
-
-=======
->>>>>>> 0ffb40c43fd6bf79ef200b2fff13b5db3970d359