merged incorrectly

Author: partouf

app.js

@@ -288,6 +288,7 @@ function ClientOptionsHandler(fileSources) {
         compileOptions: compilerPropsA(languages, 'defaultOptions', ''),
         supportsBinary: supportsBinary,
         supportsExecute: supportsExecute,
+        demanglerClassFile: props("demanglerClassFile", ""),
         languages: languages,
         sources: sources,
         raven: ceProps('ravenUrl', ''),
@@ -315,7 +316,6 @@ function ClientOptionsHandler(fileSources) {
     this.get = () => options;
 }
 
-            demanglerClassFile: props("demanglerClassFile", ""),
 function shortUrlHandler(req, res, next) {
     const resolver = new google.ShortLinkResolver(aws.getConfig('googleApiKey'));
     const bits = req.url.split("/");