3
0
mirror of https://github.com/reality/dbot.git synced 2024-11-23 20:39:25 +01:00

remove extra head

This commit is contained in:
reality 2013-06-01 15:55:48 +00:00
parent a01438a879
commit b4581b1995

View File

@ -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);