From 471b3110d6c8ed3bb1292d2b6260d8f2db921e77 Mon Sep 17 00:00:00 2001 From: phineas0fog Date: Wed, 24 Oct 2018 20:18:50 +0200 Subject: [PATCH] Update README.md (#512) removed merge beacons ;) --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 349e02924..b96ef8655 100644 --- a/README.md +++ b/README.md @@ -218,11 +218,9 @@ Many people have tried to implement encryption schemes that are essentially Vige ###### Source: [Wikipedia](https://en.wikipedia.org/wiki/Vigen%C3%A8re_cipher) ### Transposition -<<<<<<< HEAD + In cryptography, a **transposition cipher** is a method of encryption by which the positions held by units of plaintext (which are commonly characters or groups of characters) are shifted according to a regular system, so that the ciphertext constitutes a permutation of the plaintext. That is, the order of the units is changed (the plaintext is reordered).
-======= -The **Transposition cipher** is a method of encryption by which the positions held by units of *plaintext* (which are commonly characters or groups of characters) are shifted according to a regular system, so that the *ciphertext* constitutes a permutation of the plaintext. That is, the order of the units is changed (the plaintext is reordered).
->>>>>>> 3dab8e03a465397a7b671128c155c9c03f8e0154 + Mathematically a bijective function is used on the characters' positions to encrypt and an inverse function to decrypt. ###### Source: [Wikipedia](https://en.wikipedia.org/wiki/Transposition_cipher)