summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authort3sserakt <t3ss@posteo.de>2019-06-26 00:21:48 +0200
committert3sserakt <t3ss@posteo.de>2019-06-26 00:21:48 +0200
commitc9cb240e053e9eff9c499d37484b6e1066ed4289 (patch)
tree1c264da4516ccc269b8838181f0262d071d3a53e
parent1efa5f25a04093f1d74e953ae2f2841768334edd (diff)
parentf606540bcb19245aabd2f645cd9567260659ee4c (diff)
Merge branch 'cadet_option' of ssh://gnunet.org/gnunet into cadet_option
-rw-r--r--src/cadet/cadet_api.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 4bd5911ce..825768034 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -1120,13 +1120,7 @@ GNUNET_CADET_channel_create (struct GNUNET_CADET_Handle *h,
msg->ccn = ch->ccn;
msg->port = *port;
msg->peer = *destination;
-<<<<<<< 17611641fe7da3d2711e1f20eaf2ee81faf0e702
- msg->opt = htonl (options);
GNUNET_MQ_send (h->mq, env);
-=======
- GNUNET_MQ_send (h->mq,
- env);
->>>>>>> removed GNUNET_CADET_ChannelOption
return ch;
}