From 61292a7541209626f4aabeca6169fff71e698fd0 Mon Sep 17 00:00:00 2001 From: Terry Chia Date: Tue, 8 Jul 2014 17:41:51 +0800 Subject: Remove merge leftovers --- docs/hazmat/primitives/asymmetric/dsa.rst | 1 - 1 file changed, 1 deletion(-) (limited to 'docs') 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) -- cgit v1.2.3