Verified Commit caa33753 authored by Marc Vef's avatar Marc Vef
Browse files

merging oopsie

parent 6ce7cfec

src/client/preload_context.cpp

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ PreloadContext::auto_sm(bool auto_sm) { 
    PreloadContext::auto_sm_ = auto_sm;

}



}

const std::string&

PreloadContext::proxy_address_str() const {

    return proxy_address_str_;