From b4581b19955b867cac3f8b58cd364ca917ed39fb Mon Sep 17 00:00:00 2001
From: reality <tinmachin3@gmail.com>
Date: Sat, 1 Jun 2013 15:55:48 +0000
Subject: [PATCH] remove extra head

---
 modules/quotes/quotes.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/quotes/quotes.js b/modules/quotes/quotes.js
index 8192baf..ffa5372 100644
--- a/modules/quotes/quotes.js
+++ b/modules/quotes/quotes.js
@@ -9,7 +9,6 @@ var quotes = function(dbot) {
     this.rmTimer;
 
     this.internalAPI = {
-<<<<<<< HEAD
         // Parse quote interpolations
         'interpolatedQuote': function(server, channel, key, quote, callback) {
             var quoteRefs = quote.match(/~~([\d\w\s-]*)~~/g);