Fix merge leftover
commit260a2a3baf63522eaa492dd1f3d11f47d12e27a9
authorChristoph Hegemann <kRITZCREEK@users.noreply.github.com>
dateWed 7 Dec 2016, 17:59 (10 years ago)
parent9528dd5
psc-ide-server/README.md−1
@@ -22,7 +22,6 @@ It supports the following options:
2222- `--output-directory`: Specify where to look for compiled output inside your
2323 project directory. Defaults to `output/`, relative to either the current
2424 directory or the directory specified by `-d`.
25−<<<<<<< HEAD
2625- `--polling`: Uses polling instead of file system events to watch the externs
2726 files. This flag is reversed on Windows and polling is the default.
2827- `--debug`: DEPRECATED: use --log-level="debug"