From 30738e1123550a511060d5b871218894e1a9cb33 Mon Sep 17 00:00:00 2001
From: Pieter Hintjens <ph@imatix.com>
Date: Tue, 13 Nov 2012 21:39:59 +0900
Subject: [PATCH] Backported fix for ZMQ-465

---
 src/decoder.hpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/decoder.hpp b/src/decoder.hpp
index 479cceea..ec5410f0 100644
--- a/src/decoder.hpp
+++ b/src/decoder.hpp
@@ -165,7 +165,6 @@ namespace zmq
             return false;
         }
 
->>>>>>> c543b2c... Resolve LIBZMQ-465
     protected:
 
         //  Prototype of state machine action. Action should return false if