From 8417366a1b2d2b7bce35e2e4a4fdccee2a60f457 Mon Sep 17 00:00:00 2001
From: Zachary Ferguson <zfergus2@users.noreply.github.com>
Date: Thu, 15 Oct 2015 14:50:20 -0400
Subject: Cleaned up c file

---
 c.html.markdown | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'c.html.markdown')

diff --git a/c.html.markdown b/c.html.markdown
index 7bb363b3..a8f71057 100644
--- a/c.html.markdown
+++ b/c.html.markdown
@@ -6,12 +6,8 @@ contributors:
     - ["Árpád Goretity", "http://twitter.com/H2CO3_iOS"]
     - ["Jakub Trzebiatowski", "http://cbs.stgn.pl"]
     - ["Marco Scannadinari", "https://marcoms.github.io"]
-<<<<<<< HEAD
     - ["Zachary Ferguson", "https://github.io/zfergus2"]
-=======
     - ["himanshu", "https://github.com/himanshu81494"]
-
->>>>>>> refs/remotes/adambard/master
 ---
 
 Ah, C. Still **the** language of modern high-performance computing.
-- 
cgit v1.2.3