Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion

1 files changed, 20 insertions, 0 deletions

diff --git a/src/libcharon/encoding/payloads/unknown_payload.h b/src/libcharon/encoding/payloads/unknown_payload.h
index c761ed2b6..b874f6dc3 100644
--- a/src/libcharon/encoding/payloads/unknown_payload.h
+++ b/src/libcharon/encoding/payloads/unknown_payload.h
@@ -70,10 +70,30 @@ struct unknown_payload_t {
 };
 
 /**
+<<<<<<< HEAD
  * Creates an empty unknown_payload_t object.
  *
  * @return unknown_payload_t object
  */
 unknown_payload_t *unknown_payload_create(void);
+=======
+ * Creates an empty unknown_payload_t.
+ *
+ * @param			type of the payload
+ * @return			unknown_payload_t object
+ */
+unknown_payload_t *unknown_payload_create(payload_type_t type);
+
+/**
+ * Create an unknown payload with data.
+ *
+ * @param type		type of payload to create
+ * @param critical	TRUE to set critical bit
+ * @param data		data to set for this payload, gets owned by payload
+ * @return			payload object
+ */
+unknown_payload_t *unknown_payload_create_data(payload_type_t type,
+											   bool critical, chunk_t data);
+>>>>>>> upstream/4.5.1
 
 #endif /** UNKNOWN_PAYLOAD_H_ @}*/