fix missing merger

leebyron · leebyron · commit 881ac25a290b · 2016-11-17T16:38:30.000-08:00
diff --git a/site/users/index.html.js b/site/users/index.html.js
@@ -290,7 +290,6 @@ var logos = [
     link: 'http://eastview.church/'
   },
   {
-<<<<<<< HEAD
     name: 'zlyde',
     img: 'zlyde.png',
     link: 'http://www.zlyde.com/'
