From 2e6b3da1d3466db379fef0d61a23e2878d17ee9d Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Fri, 27 Apr 2018 13:31:50 -0700
Subject: Fixing some merge conflicts with structured logging. (#8685)

---
 i18n/en.json | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index c99d582f2..172ea47b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5770,10 +5770,6 @@
     "id": "store.sql.closing.info",
     "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"
@@ -5862,10 +5858,6 @@
     "id": "store.sql.table_column_type.critical",
     "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"
-- 
cgit v1.2.3-1-g7c22