fixed_merge_conflict:wq

This commit is contained in:
millb 2019-10-29 13:30:47 +03:00
parent 57f6780136
commit c154675a17

View File

@ -466,6 +466,7 @@ namespace ErrorCodes
extern const int INCORRECT_DICTIONARY_DEFINITION = 489; extern const int INCORRECT_DICTIONARY_DEFINITION = 489;
extern const int UNACCEPTABLE_URL = 490; extern const int UNACCEPTABLE_URL = 490;
extern const int KEEPER_EXCEPTION = 999; extern const int KEEPER_EXCEPTION = 999;
extern const int POCO_EXCEPTION = 1000; extern const int POCO_EXCEPTION = 1000;
extern const int STD_EXCEPTION = 1001; extern const int STD_EXCEPTION = 1001;