diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/server/SSLLib.h | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/server/SSLLib.h')
| -rw-r--r-- | lib/server/SSLLib.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/server/SSLLib.h b/lib/server/SSLLib.h index b679d623..d11c7804 100644 --- a/lib/server/SSLLib.h +++ b/lib/server/SSLLib.h @@ -29,10 +29,6 @@ namespace SSLLib { void Initialise(); -<<<<<<< HEAD - void LogError(const std::string& rErrorDuringAction); -======= ->>>>>>> 0.12 }; #endif // SSLLIB__H |