Fixes

JuliaAlgebra · May 2, 2024 · 06d6d9e · 06d6d9e
1 parent 4882992
commit 06d6d9e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/src/division.md b/docs/src/division.md
@@ -37,7 +37,6 @@ The same functions can be used with monomials and polynomials:
 ```@docs
 gcd
 lcm
-<<<<<<< HEAD
 AbstractUnivariateGCDAlgorithm
 GeneralizedEuclideanAlgorithm
 SubresultantAlgorithm
@@ -50,6 +49,4 @@ univariate_gcd
 content
 primitive_part
 primitive_part_content
-=======
->>>>>>> 1fe1303 (Promote integer to rational for division)
 ```