diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2020-07-29 18:31:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-29 18:31:15 -0500 |
| commit | 6844f72ab5184bcfee763bfe80baf1ee387a5811 (patch) | |
| tree | e195ebbb3fee26a587466af4d39a50af1ecfa6a0 | |
| parent | 3afdad90c8eceef4194657713033c6c48d6e97cd (diff) | |
Fix build error from bad merge
redefinition of objection_mod
| -rw-r--r-- | src/courtroom.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index d8a18ce2..f16d9a92 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1864,7 +1864,6 @@ void Courtroom::handle_chatmessage(QStringList *p_contents) append_ic_text(m_chatmessage[MESSAGE], f_showname, "", m_chatmessage[TEXT_COLOR].toInt()); - int objection_mod = m_chatmessage[OBJECTION_MOD].toInt(); QString f_char = m_chatmessage[CHAR_NAME]; QString f_custom_theme = ao_app->get_char_shouts(f_char); |