merge changes

2025-07-03 08:55:52 +00:00 · 2017-04-10 00:25:29 +03:00
parent f56c937651 baa20af363
commit f68d607da8
3 changed files with 10 additions and 0 deletions
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
@ -99,9 +99,12 @@ QVariantHash QueuedTcpServerResponseHelperApi1::getData(
        else if (_type == "POST")
            output = QueuedTcpServerResponseHelperTask::addOrEditTask(
                _arg.toLongLong(), _data, _token);
+<<<<<<< HEAD
        else if (_type == "PUT")
            output = QueuedTcpServerResponseHelperTask::startOrStopTask(
                _arg.toLongLong(), _token);
+=======
+>>>>>>> baa20af363cb4b97cb6f7b36f833cf40f34cc61d
        else
            output = {{"code", 405}};
        break;