style: apply lint-style updates (bibliography/doc formatting)

Author: BeibeiX0

Mathlib.lean

@@ -2987,6 +2987,7 @@ import Mathlib.Combinatorics.Enumerative.DyckWord
 import Mathlib.Combinatorics.Enumerative.IncidenceAlgebra
 import Mathlib.Combinatorics.Enumerative.InclusionExclusion
 import Mathlib.Combinatorics.Enumerative.Partition
+import Mathlib.Combinatorics.Enumerative.PentagonalNumbers
 import Mathlib.Combinatorics.Enumerative.Stirling
 import Mathlib.Combinatorics.Extremal.RuzsaSzemeredi
 import Mathlib.Combinatorics.Graph.Basic

Mathlib/Combinatorics/Enumerative/PentagonalNumbers.lean

@@ -262,14 +262,5 @@ noncomputable def E (n : ℕ) : PowerSeries ℤ :=
 lemma coeff_E_eq_coeff_cutoff (n : ℕ) :
     (PowerSeries.coeff n) (E n) =
       (PowerSeries.coeff n)
-<<<<<<< HEAD
         (∏ k ∈ Finset.range (n + 1), (1 - (PowerSeries.X : PowerSeries ℤ) ^ (k + 1))) := by
   rfl
-=======
-<<<<<<< HEAD
-        (∏ k ∈ Finset.range (n + 1), (1 - (PowerSeries.X : PowerSeries ℤ) ^ (k + 1))) := by rfl
-=======
-        (∏ k ∈ Finset.range (n + 1), (1 - (PowerSeries.X : PowerSeries ℤ) ^ (k + 1))) := by
-  simp [E]
->>>>>>> bdef99ea153 ([pre-commit.ci lite] apply automatic fixes)
->>>>>>> da7abdd60e2 (style: apply lint-style updates (bibliography/doc formatting))