commit 576a15393fd3efb1512926c5ce1884b602104539
author David Reid <dreid@dreid.org> Wed May 28 14:00:41 2014 -0700
committer David Reid <dreid@dreid.org> Tue Jun 03 10:05:38 2014 -0700
tree 378a142c3113a823b08b38269815bf38e2886be6
parent 68b509a399b5d24b6e6fe1b707096928a8483c9a

Resolve conflict.

docs/hazmat/backends/interfaces.rst

diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst
index 341fdc3..c7d5667 100644
--- a/docs/hazmat/backends/interfaces.rst
+++ b/docs/hazmat/backends/interfaces.rst
@@ -315,14 +315,13 @@
             :class:`~cryptography.hazmat.primitives.interfaces.AsymmetricPadding`
             provider.
 
-<<<<<<< HEAD
         :return bytes: The encrypted data.
 
         :raises cryptography.exceptions.UnsupportedAlgorithm: If an unsupported
             MGF, hash function, or padding is chosen.
 
         :raises ValueError: When plaintext is too long for the key size.
-=======
+
     .. method:: load_rsa_numbers(numbers):
 
         :param numbers: An instance of
@@ -336,7 +335,6 @@
             :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateNumbers` or
             :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicNumbers`.
 
->>>>>>> 70cf9ba... Document the backend interface.
 
 .. class:: TraditionalOpenSSLSerializationBackend