remove extra head

2013-06-01 15:55:48 +00:00 · 2013-06-01 15:55:48 +00:00 · b4581b1995
commit b4581b1995
parent a01438a879
1 changed files with 0 additions and 1 deletions
--- 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);