Permalink
Browse files

Resolved conflicts after merge

  • Loading branch information...
hintjens committed Feb 16, 2012
2 parents 0efb49f + 07b49ff commit 8a497e2ffc16cbd6c2642ac2238dd186d917f684
Showing with 0 additions and 1 deletion.
  1. +0 −1 include/zmq.h
View
@@ -168,7 +168,6 @@ ZMQ_EXPORT int zmq_msg_close (zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_move (zmq_msg_t *dest, zmq_msg_t *src);
ZMQ_EXPORT int zmq_msg_copy (zmq_msg_t *dest, zmq_msg_t *src);
ZMQ_EXPORT void *zmq_msg_data (zmq_msg_t *msg);
-
ZMQ_EXPORT ssize_t zmq_msg_size (zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_more (zmq_msg_t *msg);
ZMQ_EXPORT int zmq_msg_get (zmq_msg_t *msg, int option, void *optval,

0 comments on commit 8a497e2

Please sign in to comment.