From f7bab0dc216609a8983b1f88cac7903e47382c0b Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <grin@lbry.io>
Date: Fri, 24 Aug 2018 15:53:18 -0400
Subject: [PATCH] fix

---
 view/template/page/team.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/view/template/page/team.php b/view/template/page/team.php
index cadc0d5b..66258d0e 100644
--- a/view/template/page/team.php
+++ b/view/template/page/team.php
@@ -30,11 +30,7 @@
       </div>
     <?php endforeach ?>
     <h2>Business</h2>
-<<<<<<< HEAD
-    <?php foreach(['josh-finer',
-=======
     <?php foreach (['josh-finer',
->>>>>>> master
                     'tom-zarebczan',
                     'brinck-slattery',
                     'rob-smith',