minor merge problem corrected

36707529 · Martin Sustrik · 89b1f278 · 36707529
Commit 36707529 authored Sep 14, 2009 by Martin Sustrik
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

pub.cpp src/pub.cpp +1 -1

No files found.
--- a/src/pub.cpp
+++ b/src/pub.cpp
@@ -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)
 {
 }