From d18782afd787f0e319a9658bdc116f54b91ece71 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 20 Jul 2017 15:34:44 -0500 Subject: [PATCH] fixed a conflict --- site/concepts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts.md b/site/concepts.md index eb361228..1251e51a 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -20,4 +20,4 @@ The section contains topics about how Weave Net works as well as providing a tec * [Establishing the Emphemeral Session Key](https://weave.works/docs/net/latest/concepts/network-topology/#ephemeral-key) * [Key Generation and the Linux CSPRIN](https://weave.works/docs/net/latest/concepts/network-topology/#cspring) * [Encrypting and Decrypting TCP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#tcp) - * [Encrypting and Decrypting UDP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#udp) \ No newline at end of file + * [Encrypting and Decrypting UDP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#udp)