Remove git rebase artifact from changelog

Signed-off-by: Nathan Rebours <[email protected]>
ocaml-ppx · Jan 28, 2025 · c26969c · c26969c
1 parent 7978f00
commit c26969c
Showing 1 changed file with 0 additions and 1 deletion.
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)
 -------------------