fixed a conflict

This commit is contained in:
abuehrle committed 2017-07-20 15:34:44 -05:00
1 parent 43dfbdc8e3
commit d18782afd7
1 file changed
+1 -1
+1 -1
View File
@@ -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)
* [Encrypting and Decrypting UDP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#udp)