Branch merge

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10933 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 2555ff25daee5ec4e1e6c2a32c033839de7085ea..7e25aa217bb1e05c3e8e994029dc6ca15713c936 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -516,7 +516,7 @@ InspIRCd::InspIRCd(int argc, char** argv)
                /* Windows can (and defaults to) hide file extensions, so let's play a bit nice for windows users. */
                std::string txtconf = this->ConfigFileName;
                txtconf.append(".txt");
-               
+
                if (ServerConfig::FileExists(txtconf.c_str()))
                {
                        strlcat(this->ConfigFileName, ".txt", MAXBUF);