[ agda#6055, CHANGELOG ] latest -> v20221128.

JobPetrovcic · Apr 5, 2024 · 92794bf · 92794bf
1 parent bada7be
commit 92794bf
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -120,6 +120,7 @@ Interaction and emacs mode
   The reimplementation does not support case splitting (`-c`), disproving
   (`-d`) or refining (`-r`).
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 Backends
@@ -128,6 +129,9 @@ Backends
 =======
 * Agsy ([automatic proof search](https://agda.readthedocs.io/en/latest/tools/auto.html)) can
 >>>>>>> 6ea42a26d (Revert "[ #6055, CHANGELOG ] latest -> 2.6.2.2.20221106.")
+=======
+* Agsy ([automatic proof search](https://agda.readthedocs.io/en/v2.6.2.2.20221128/tools/auto.html)) can
+>>>>>>> 22d497858 ([ #6055, CHANGELOG ] latest -> v20221128.)
   now be invoked in the right-hand-sides of copattern matching clauses.
   ([#5827](https://github.com/agda/agda/pull/5827))