get rid of merge conflict
authorAaron Zauner <azet@azet.org>
Mon, 9 Dec 2013 21:37:46 +0000 (22:37 +0100)
committerAaron Zauner <azet@azet.org>
Mon, 9 Dec 2013 21:37:46 +0000 (22:37 +0100)
commitdf5abc98e280b5dd4d1944f15a2e7df7637730b5
tree1d6630356d84f86046c1587d44ec5518f7b6afef
parent4b513e74d8563d830d3516a795c75a74ad1e13a4
get rid of merge conflict
src/cipher_suites/recommended.tex