From c154675a1766255bd2509cc0d6b3ab47609065a3 Mon Sep 17 00:00:00 2001
From: millb <mikhail.korotov.io@yandex.ru>
Date: Tue, 29 Oct 2019 13:30:47 +0300
Subject: [PATCH] fixed_merge_conflict:wq

---
 dbms/src/Common/ErrorCodes.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dbms/src/Common/ErrorCodes.cpp b/dbms/src/Common/ErrorCodes.cpp
index 8ced7b75516..6db3816e670 100644
--- a/dbms/src/Common/ErrorCodes.cpp
+++ b/dbms/src/Common/ErrorCodes.cpp
@@ -466,6 +466,7 @@ namespace ErrorCodes
     extern const int INCORRECT_DICTIONARY_DEFINITION = 489;
     extern const int UNACCEPTABLE_URL = 490;
 
+
     extern const int KEEPER_EXCEPTION = 999;
     extern const int POCO_EXCEPTION = 1000;
     extern const int STD_EXCEPTION = 1001;