removed merge conflicts from bug fix of zmq buffering while acquire from command line

slsDetectorGui/include/qTabAdvanced.h

@@ -170,6 +170,10 @@ private slots:
 	 */
 	void SetReceiver();
 
+	/** Restart data streaming in receiver and gui
+	 */
+	void RestartStreaming();
+
 	/** Add ROI Input if the value changed in the last slot
 	 */
 	void AddROIInputSlot(){AddROIInput(1);};