message: Fixed erroneous merge commit
diff: @@ -19,15 +19,6 @@ RTT::ConnPolicy rtt_roscomm::topicLatched(const std::string& name) {
  return cp;
  }
  -RTT::ConnPolicy rtt_roscomm::topicLatched(const std::string& name) {
  - RTT::ConnPolicy cp = RTT::ConnPolicy::data();
  - cp.transport = protocol_id;
  - cp.name_id = name;
  - cp.init = true;
  - cp.pull = false;
  - return cp;
  -}
  -
  /**
  * Returns a ConnPolicy object for streaming to or from
  * the given ROS topic. Also specifies the buffer size of
  