diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/server/SSLLib.h | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
Diffstat (limited to 'lib/server/SSLLib.h')
| -rw-r--r-- | lib/server/SSLLib.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/server/SSLLib.h b/lib/server/SSLLib.h index ff4aab19..b679d623 100644 --- a/lib/server/SSLLib.h +++ b/lib/server/SSLLib.h @@ -29,7 +29,10 @@ namespace SSLLib { void Initialise(); +<<<<<<< HEAD void LogError(const std::string& rErrorDuringAction); +======= +>>>>>>> 0.12 }; #endif // SSLLIB__H |