resolved merge conflicts

This commit is contained in:
Renan DelValle 2016-12-22 23:17:01 -05:00
commit 71c889982f
3 changed files with 3 additions and 3 deletions

View file

@ -19,7 +19,7 @@ machine on which electron is launched for logging to work**
How to run (Use the --help option to get information about other command-line options):
`./electron -workload <workload json>`
`./electron -workload <workload json>`
To run electron with ignoreWatts, run the following command,