From 2e209e8ea86ddd7dd6ca08d8a97514ddca21b014 Mon Sep 17 00:00:00 2001
From: Frank Ueberschar <frank.ueberschar@bareos.com>
Date: Tue, 2 Oct 2018 22:12:55 +0200
Subject: [PATCH] corrected a merge error

---
 core/src/lib/tls_openssl_private.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/lib/tls_openssl_private.cc b/core/src/lib/tls_openssl_private.cc
index 38cdb5e3389..fc7074596fa 100644
--- a/core/src/lib/tls_openssl_private.cc
+++ b/core/src/lib/tls_openssl_private.cc
@@ -364,6 +364,7 @@ void TlsOpenSslPrivate::ClientContextInsertCredentials(const PskCredentials &cre
   } else {
   TlsOpenSslPrivate::psk_client_credentials_.insert(
       std::pair<const SSL_CTX *, PskCredentials>(openssl_ctx_, credentials));
+  }
 }
 
 unsigned int TlsOpenSslPrivate::psk_server_cb(SSL *ssl,