summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2018-04-27 13:31:50 -0700
committerGitHub <noreply@github.com>2018-04-27 13:31:50 -0700
commit2e6b3da1d3466db379fef0d61a23e2878d17ee9d (patch)
treeff739774e14e1747fe01a265d360f599ffc21bde /i18n
parent686c2fbab7607d42183ae685a27ea3d7dce8c3f6 (diff)
downloadchat-2e6b3da1d3466db379fef0d61a23e2878d17ee9d.tar.gz
chat-2e6b3da1d3466db379fef0d61a23e2878d17ee9d.tar.bz2
chat-2e6b3da1d3466db379fef0d61a23e2878d17ee9d.zip
Fixing some merge conflicts with structured logging. (#8685)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json8
1 files changed, 0 insertions, 8 deletions
diff --git a/i18n/en.json b/i18n/en.json
index c99d582f2..172ea47b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5771,10 +5771,6 @@
"translation": "Closing SqlStore"
},
{
- "id": "store.sql.column_exists.critical",
- "translation": "Failed to check if column exists %v"
- },
- {
"id": "store.sql.column_exists_missing_driver.critical",
"translation": "Failed to check if column exists because of missing driver"
},
@@ -5863,10 +5859,6 @@
"translation": "Failed to get data type for column %s from table %s: %v"
},
{
- "id": "store.sql.table_exists.critical",
- "translation": "Failed to check if table exists %v"
- },
- {
"id": "store.sql.too_short_ciphertext",
"translation": "ciphertext too short"
},