From 21b2494bb6a749844101f202a7953dc9d48829b9 Mon Sep 17 00:00:00 2001 From: Akamaru Date: Fri, 26 Aug 2016 18:09:43 +0200 Subject: [PATCH] Upps --- miku/plugins/quotes.lua | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/miku/plugins/quotes.lua b/miku/plugins/quotes.lua index 35eb4ae..c2c1155 100644 --- a/miku/plugins/quotes.lua +++ b/miku/plugins/quotes.lua @@ -88,13 +88,8 @@ function quotes:action(msg, config, matches) utilities.send_reply(msg, quotes:save_quote(msg), true) return elseif matches[1] == "delquote" and matches[2] then -<<<<<<< HEAD:miku/plugins/quotes.lua - if msg.from.id ~= config.admin then - utilities.send_reply(msg, config.errors.sudo, true) -======= if not is_sudo(msg, config) then - utilities.send_reply(msg, config.errors.sudo) ->>>>>>> upstream/master:otouto/plugins/quotes.lua + utilities.send_reply(msg, config.errors.sudo, true) return end utilities.send_reply(msg, quotes:delete_quote(msg), true)