From f52247a6e8000b743ef61b5cea1e3d3f7a723241 Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Thu, 27 Apr 2006 22:21:23 +0200
Subject: Fix merge error

---
 extra/yassl/src/yassl_int.cpp        | 2 +-
 extra/yassl/taocrypt/src/integer.cpp | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp
index d998dbf905e..396461a6ed5 100644
--- a/extra/yassl/src/yassl_int.cpp
+++ b/extra/yassl/src/yassl_int.cpp
@@ -1375,7 +1375,7 @@ Sessions& GetSessions()
 
 static sslFactory* sslFactoryInstance = 0;
 
-sslFactory& GetSSL_Factory()
+sslFactory& GetSSL_Factory(){
     if (!sslFactoryInstance)
         sslFactoryInstance = NEW_YS sslFactory;
     return *sslFactoryInstance;
diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp
index b2a66bd5bf3..82a248ff7da 100644
--- a/extra/yassl/taocrypt/src/integer.cpp
+++ b/extra/yassl/taocrypt/src/integer.cpp
@@ -2738,14 +2738,6 @@ void CleanUp()
 }
 
 
-// Clean up static singleton holders, not a leak, but helpful to have gone
-// when checking for leaks
-void CleanUp()
-{
-    tcDelete(one);
-    tcDelete(zero);
-}
-
 Integer::Integer(RandomNumberGenerator& rng, const Integer& min,
                  const Integer& max)
 {
-- 
cgit v1.2.1