Making a mess of git before morning coffee

Author: GiacomoPope

src/sage/rings/finite_rings/element_base.pyx

@@ -144,16 +144,10 @@ cdef class FiniteRingElement(CommutativeRingElement):
 
     def to_bytes(self, byteorder="big"):
         """
-<<<<<<< HEAD
         Return an array of bytes representing an integer.
 
         Internally relies on the python ``int.to_bytes()`` method.
         Length of byte array is determined from the field's order.
-=======
-        Return an array of bytes representing an integer. Internally relies
-        on the Python ``int.to_bytes()`` method. The length of the byte array
-        is fixed by the parent field's order.
->>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT:
 
@@ -1118,16 +1112,10 @@ cdef class FinitePolyExtElement(FiniteRingElement):
 
     def to_bytes(self, byteorder="big"):
         """
-<<<<<<< HEAD
         Return an array of bytes representing an integer.
 
         Internally relies on the python ``int.to_bytes()`` method.
         Length of byte array is determined from the field's order.
-=======
-        Return an array of bytes representing an integer. Internally relies
-        on the Python ``int.to_bytes()`` method. The length of the byte array
-        is fixed by the parent field's order.
->>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT:
 

src/sage/rings/finite_rings/finite_field_base.pyx

@@ -2119,14 +2119,9 @@ cdef class FiniteField(Field):
 
     def from_bytes(self, input_bytes, byteorder="big"):
         """
-<<<<<<< HEAD
         Return the integer represented by the given array of bytes.
 
         Internally relies on the python ``int.from_bytes()`` method.
-=======
-        Return the integer represented by the given array of bytes. Internally relies
-        on the Python ``int.from_bytes()`` method.
->>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT:
 

src/sage/rings/integer.pyx

@@ -7165,14 +7165,9 @@ cdef class Integer(sage.structure.element.EuclideanDomainElement):
 
     def to_bytes(self, length=1, byteorder="big", is_signed=False):
         """
-<<<<<<< HEAD
         Return an array of bytes representing an integer.
 
         Internally relies on the python ``int.to_bytes()`` method.
-=======
-        Return an array of bytes representing an integer. Internally relies
-        on the Python ``int.to_bytes()`` method.
->>>>>>> 6d8b1dfaf02cbd4b09f692e7d2201379553b03c4
 
         INPUT: