From 8dbc838c570f7fcb5d0bee4edaff7742ac94f649 Mon Sep 17 00:00:00 2001
From: Matthew Adams <matthew@matthewadams.me>
Date: Fri, 6 Dec 2013 14:59:15 -0600
Subject: [PATCH] fixed readme

---
 README.adoc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.adoc b/README.adoc
index 38fee45cf..26bf88a87 100644
--- a/README.adoc
+++ b/README.adoc
@@ -45,10 +45,7 @@ companies and individuals:
 
 * http://www.prowaveconsulting.com[Prowave Consulting]
 * http://www.scispike.com[SciSpike]
-<<<<<<< HEAD
 * http://www.vha.com[VHA]
-=======
->>>>>>> 826da5317d6312d09071d1184d74327a6fae6e93
 * Alexander Shvid
 
 The following companies and individuals are also generously providing