GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2024-11-27 22:39:26 +01:00
Code Issues Projects Releases Wiki Activity

remove extra head

Browse Source
This commit is contained in:
reality 2013-06-01 15:55:48 +00:00
parent a01438a879
commit b4581b1995
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/quotes/quotes.js
View File

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