diff options
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 |