diff options
Diffstat (limited to 'modules/database/db_mysql.cpp')
| -rw-r--r-- | modules/database/db_mysql.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/modules/database/db_mysql.cpp b/modules/database/db_mysql.cpp index 4a9c52202..e03c89d16 100644 --- a/modules/database/db_mysql.cpp +++ b/modules/database/db_mysql.cpp @@ -1538,11 +1538,7 @@ static void SaveDatabases() me->OnAkickAdd(ci, ak); } -<<<<<<< HEAD - me->OnLevelChange(NULL, ci, -1, -1); -======= me->OnLevelChange(NULL, ci, "ALL", -1); ->>>>>>> 348a3db... Allow modules to add their own channel levels for (unsigned j = 0, end = ci->memos.memos.size(); j < end; ++j) { |