fixing conflicts

This commit is contained in:
unlnown542a 2018-01-22 01:30:21 +03:00
parent 42d3770b14
commit 347a2c2150
11 changed files with 205 additions and 55 deletions

View file

@ -37,7 +37,7 @@ namespace android
* returns "ok" if daemon init failed
* returns errinfo if daemon initialized and started okay
*/
std::string start();
std::string start(int argc, char* argv[]);
// stops the daemon
void stop();