Commit 9c18f05d authored by Gertulla, Janis Luca's avatar Gertulla, Janis Luca
Browse files

conflicts

parent 9ced2c6f
......@@ -97,6 +97,8 @@ Client::Client() : QTcpSocket()
disconnectFromHost();
emit log("No pong received within 3 seconds, resetting connection.");
});
this->setSocketOption(KeepAliveOption, true);
}
......
......@@ -179,13 +179,8 @@
<widget class="QLabel" name="tDpsLabel">
<property name="geometry">
<rect>
<<<<<<< HEAD
<x>490</x>
<y>410</y>
=======
<x>650</x>
<y>60</y>
>>>>>>> d6ae6c4492c0852bab2d27ec9e6b082d5b701f42
<width>60</width>
<height>30</height>
</rect>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment