fix merge error (#25573)
authorMaoni Stephens <Maoni0@users.noreply.github.com>
Sat, 6 Jul 2019 07:09:32 +0000 (00:09 -0700)
committerGitHub <noreply@github.com>
Sat, 6 Jul 2019 07:09:32 +0000 (00:09 -0700)
commit1d78ed88ff9078febdbb5c37173b313da5c023a3
treeb963af0622e700294e7da296aa61de3687ed58e0
parent09d454011f5b302ef526036266993f8b0e92f1fd
fix merge error (#25573)
src/utilcode/util.cpp