Merge branch 'master' of https://github.com/fenghaitao/incubator-cord…

…ova-weinre into issue-266
apache · Feb 21, 2012 · 309e7e4a3f8deda954bdbc346908be8b46f63f4d · 309e7e4
2 parents 4eae8a1 + 23e971f
commit 309e7e4a3f8deda954bdbc346908be8b46f63f4d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/weinre.server/lib/cli.coffee b/weinre.server/lib/cli.coffee
@@ -104,7 +104,7 @@ getDotWeinreServerProperties = () ->
     properties = {}
 
     fileName = replaceTilde '~/.weinre/server.properties'
-    return options if !path.existsSync(fileName) 
+    return properties if !path.existsSync(fileName)
 
     contents = fs.readFileSync(fileName, 'utf8')
     lines    = contents.split('\n')