Remove git rebase artifact from changelog

NathanReb · NathanReb · commit c26969cc3a07 · 2025-01-28T14:50:04.000+01:00
Signed-off-by: Nathan Rebours &lt;nathan.p.rebours@gmail.com&gt;
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,7 +8,6 @@ unreleased
  `Pprintast` instead of ppxlib's.
  (#555, @NathanReb)
 
->>>>>>> 0d3e8b95 (Add --use-compiler-pp flag to standalone driver)
 0.34.0 (2025-01-06)
 -------------------
 
