Skip to content

Commit 471b311

Browse files
phineas0fogharshildarji
authored andcommitted
Update README.md (TheAlgorithms#512)
removed merge beacons ;)
1 parent c7de76d commit 471b311

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,9 @@ Many people have tried to implement encryption schemes that are essentially Vige
218218
###### Source: [Wikipedia](https://en.wikipedia.org/wiki/Vigen%C3%A8re_cipher)
219219

220220
### Transposition
221-
<<<<<<< HEAD
221+
222222
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).<br>
223-
=======
224-
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).<br>
225-
>>>>>>> 3dab8e03a465397a7b671128c155c9c03f8e0154
223+
226224
Mathematically a bijective function is used on the characters' positions to encrypt and an inverse function to decrypt.
227225
###### Source: [Wikipedia](https://en.wikipedia.org/wiki/Transposition_cipher)
228226

0 commit comments

Comments
 (0)