From 5d1094c12d25864d3184701becc9d24ac387990b Mon Sep 17 00:00:00 2001 From: scatterflower Date: Sun, 18 Apr 2021 19:44:34 -0500 Subject: [PATCH] fix messed up merge conflict resolution --- include/aoclient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/aoclient.h b/include/aoclient.h index 137ddfd..254066b 100644 --- a/include/aoclient.h +++ b/include/aoclient.h @@ -1986,7 +1986,7 @@ class AOClient : public QObject { {"unblock_dj", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnBlockDj}}, {"charcurse", {ACLFlags.value("MUTE"), 1, &AOClient::cmdCharCurse}}, {"uncharcurse", {ACLFlags.value("MUTE"), 1, &AOClient::cmdUnCharCurse}}, - {"charselect", {ACLFlags.value("NONE"), 0, &AOClient::cmdCharSelect}} + {"charselect", {ACLFlags.value("NONE"), 0, &AOClient::cmdCharSelect}}, {"a", {ACLFlags.value("NONE"), 2, &AOClient::cmdA}}, {"s", {ACLFlags.value("NONE"), 0, &AOClient::cmdS}} };