minor merge problem corrected

This commit is contained in:
Martin Sustrik 2009-09-14 09:40:35 +02:00
parent 89b1f2782c
commit 36707529a7

View File

@ -23,7 +23,7 @@
#include "err.hpp"
zmq::pub_t::pub_t (class app_thread_t *parent_) :
socket_base_t (parent_)
socket_base_t (parent_, ZMQ_SUB)
{
}