Revert "try to make merges on generated js files better"

This reverts commit 3e285b5d682dce36921145d7fe8567fb257d3429.

1 files changed, 3 insertions, 3 deletions

diff --git a/SConstruct b/SConstruct
index 3b37ecf6899..b7590940099 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1106,7 +1106,7 @@ def jsToH(target, source, env):
     if len( source ) != 1:
         raise Exception( "wrong" )
 
-    h = "const char * jsconcatcode" + outFile.split( "mongo" )[-1].replace( "-" , "_").split( ".cpp")[0] + " = \r\n"
+    h = "const char * jsconcatcode" + outFile.split( "mongo" )[-1].replace( "-" , "_").split( ".cpp")[0] + " = \n"
 
     for l in open( str(source[0]) , 'r' ):
         l = l.strip()
@@ -1114,9 +1114,9 @@ def jsToH(target, source, env):
         l = l.replace( '"' , "\\\"" )
 
 
-        h += '"' + l + "\\n\"\r\n "
+        h += '"' + l + "\\n\"\n "
 
-    h += ";\r\n\r\n"
+    h += ";\n\n"
 
     out = open( outFile , 'w' )
     out.write( h )