This commit is contained in:
artpaul 2016-12-15 23:21:38 +05:00
parent 722e4dab6d
commit 945f879765

View File

@ -5,7 +5,6 @@
namespace DB
{
<<<<<<< HEAD
/// We assume that size of the buf isn't less than url.size().
static size_t decodeUrl(const StringView & url, char* dst)
{