diff options
Diffstat (limited to 'lib/common/UnixUser.h')
| -rw-r--r-- | lib/common/UnixUser.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/common/UnixUser.h b/lib/common/UnixUser.h index 361971b8..dafe6aa7 100644 --- a/lib/common/UnixUser.h +++ b/lib/common/UnixUser.h @@ -13,11 +13,7 @@ class UnixUser { public: -<<<<<<< HEAD - UnixUser(const char *Username); -======= UnixUser(const std::string& Username); ->>>>>>> 0.12 UnixUser(uid_t UID, gid_t GID); ~UnixUser(); private: |