Merge remote-tracking branch 'origin/patch'

This commit is contained in:
ghidra1 2019-05-15 15:28:42 -04:00
commit 9f3e323a79

View file

@ -35,7 +35,7 @@ set SCRIPT_DIR=%~dp0
:: Production Environment
set CONFIG=%SCRIPT_DIR%.\server.conf
if exist "%GHIDRA_DIR%" goto continue
if exist "%CONFIG%" goto continue
:: Development Environment
set CONFIG=%SCRIPT_DIR%..\..\Common\server\server.conf