generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-19 08:46:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix conflicting merge

Browse Source
This commit is contained in:
zosrothko 2018-02-17 16:12:03 +01:00 committed by GitHub
parent f1cd23b71b
commit 716a798256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Foundation/src/Path_WIN32U.cpp
View File

@ -132,14 +132,11 @@ std::string PathImpl::cacheHomeImpl()
} }
<<<<<<< HEAD
=======
std::string PathImpl::tempHomeImpl() std::string PathImpl::tempHomeImpl()
{ {
return tempImpl(); return tempImpl();
} }
>>>>>>> 06e59cb... add Windows compliant implementation of XDG Base Directory Specification
std::string PathImpl::tempImpl() std::string PathImpl::tempImpl()
{ {
Buffer<wchar_t> buffer(MAX_PATH_LEN); Buffer<wchar_t> buffer(MAX_PATH_LEN);