*Merge.

--HG--
branch : trunk

4 files changed, 4 insertions, 0 deletions

diff --git a/src/shared/Config/dotconfpp/dotconfpp.cpp b/src/shared/Config/dotconfpp/dotconfpp.cpp
index c46b1fe6fb9..bd575d95ece 100644
--- a/src/shared/Config/dotconfpp/dotconfpp.cpp
+++ b/src/shared/Config/dotconfpp/dotconfpp.cpp
@@ -586,3 +586,4 @@ void DOTCONFDocument::setRequiredOptionNames(const char ** requiredOptionNames)
         ++requiredOptionNames;
     }
 }
+
diff --git a/src/shared/Config/dotconfpp/dotconfpp.h b/src/shared/Config/dotconfpp/dotconfpp.h
index 15c4f7fcd78..7887f86ccc1 100644
--- a/src/shared/Config/dotconfpp/dotconfpp.h
+++ b/src/shared/Config/dotconfpp/dotconfpp.h
@@ -108,3 +108,4 @@ public:
 };
 
 #endif
+
diff --git a/src/shared/Config/dotconfpp/mempool.cpp b/src/shared/Config/dotconfpp/mempool.cpp
index cf589ffb2bc..487dae0bd0a 100644
--- a/src/shared/Config/dotconfpp/mempool.cpp
+++ b/src/shared/Config/dotconfpp/mempool.cpp
@@ -98,3 +98,4 @@ char * AsyncDNSMemPool::strdup(const char *str)
 {
     return ::strcpy((char*)this->alloc(strlen(str)+1), str);
 }
+
diff --git a/src/shared/Config/dotconfpp/mempool.h b/src/shared/Config/dotconfpp/mempool.h
index 04bd1e006ad..81c01d15a58 100644
--- a/src/shared/Config/dotconfpp/mempool.h
+++ b/src/shared/Config/dotconfpp/mempool.h
@@ -44,3 +44,4 @@ public:
 };
 
 #endif
+