From: Neil Smith Date: Wed, 21 May 2014 17:19:22 +0000 (+0100) Subject: Fixed the merge conflict X-Git-Url: https://git.njae.me.uk/?p=cipher-training.git;a=commitdiff_plain;h=ee8bb0b7953e32c988f4faa72c0eb4c6cd6e4ea8 Fixed the merge conflict --- ee8bb0b7953e32c988f4faa72c0eb4c6cd6e4ea8 diff --cc slides/keyword-encipher.html index e96de86,0000000..7258e9c mode 100644,000000..100644 --- a/slides/keyword-encipher.html +++ b/slides/keyword-encipher.html @@@ -1,187 -1,0 +1,198 @@@ + + + + Affine ciphers + + + + + + + + + + + +