diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-07-08 07:49:05 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-07-08 07:49:05 -0500 |
| commit | e5ac40c01af9a5e326217a4231fc917f05154889 (patch) | |
| tree | e712d412053a69fe0890f4bd22aa467ca32a873c /docs | |
| parent | 5a3e0754f94a280783e0d5b9c1082097566fa62f (diff) | |
| parent | 61292a7541209626f4aabeca6169fff71e698fd0 (diff) | |
| download | cryptography-e5ac40c01af9a5e326217a4231fc917f05154889.tar.gz cryptography-e5ac40c01af9a5e326217a4231fc917f05154889.tar.bz2 cryptography-e5ac40c01af9a5e326217a4231fc917f05154889.zip | |
Merge pull request #1228 from Ayrx/remove-merge-leftovers
Remove merge leftovers
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/asymmetric/dsa.rst | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/asymmetric/dsa.rst b/docs/hazmat/primitives/asymmetric/dsa.rst index 6cb624dd..55f36b51 100644 --- a/docs/hazmat/primitives/asymmetric/dsa.rst +++ b/docs/hazmat/primitives/asymmetric/dsa.rst @@ -170,7 +170,6 @@ providers of the :class:`~cryptography.hazmat.primitives.interfaces.DSAParameters`, :class:`~cryptography.hazmat.primitives.interfaces.DSAPrivateKey`, and :class:`~cryptography.hazmat.primitives.interfaces.DSAPublicKey` interfaces. ->>>>>>> deprecate concrete DSA classes and update DSA docs .. class:: DSAParameters(modulus, subgroup_order, generator) |