From 66ed4a8bced713cf8653023debdf43cf9bb4421f Mon Sep 17 00:00:00 2001
From: Matt <kiswa@users.noreply.github.com>
Date: Mon, 10 Nov 2014 21:33:02 -0500
Subject: [PATCH] Update VERSION

---
 VERSION | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/VERSION b/VERSION
index 3e2c625..8d0c9d6 100644
--- a/VERSION
+++ b/VERSION
@@ -2,16 +2,9 @@ v0.2.6
 
 Changelog
 
-<<<<<<< HEAD
  * Settings Updates
    * Choose to hide items on filter
    * Choose boards when creating/editing a user
  * Comments can be edited
  * Dates show up on comments and attachments without reload
  * Opening login page redirects to boards if a valid token is found
-
-=======
- * Markdown support in comments
- * Cursor on default input field
- * Show app version
->>>>>>> master