Fixed error from merge

This commit is contained in:
XinyuHou 2015-04-14 13:44:10 +01:00
parent b4665b9cd5
commit 28eb85660f
8 changed files with 28 additions and 28 deletions

View file

@ -59,7 +59,7 @@ public:
virtual void secureConnect() {}
virtual void secureAccept() {}
virtual void setFingerprintFilename(CString& f) {}
virtual void setFingerprintFilename(String& f) {}
protected:
ArchSocket getSocket() { return m_socket; }