merge fix

This commit is contained in:
Luke Slater 2011-11-25 12:33:20 +00:00
parent f0e079539f
commit b03a36f5f6

View File

@ -109,8 +109,8 @@ var quotes = function(dbot) {
rmAllowed = true; rmAllowed = true;
dbot.say(data.channel, 'Quote saved in \'' + q[1] + '\' (' + quotes[key].length + ')'); dbot.say(data.channel, 'Quote saved in \'' + q[1] + '\' (' + quotes[key].length + ')');
if(data.channel == 'reality') { if(data.channel == 'Snow') {
dbot.say('#realitest', 'Public Service Announcement: Snow added \'' + q[1] + '\' to ' + key + ' in PM'); dbot.say('#42', 'Public Service Announcement: Snow added \'' + q[2] + '\' to ' + key + ' in PM');
} }
} else { } else {
dbot.say(data.channel, 'Invalid syntax. Initiate incineration.'); dbot.say(data.channel, 'Invalid syntax. Initiate incineration.');