CHANGELOG [skip ci]

Author: tcompa

CHANGELOG.md

@@ -4,11 +4,8 @@
 
 * Dependencies:
     * Drop support for Python 3.10 (\#932).
-<<<<<<< HEAD
     * Bump `fractal-task-tools` to `0.0.12` (\#933).
-=======
     * Pin `numcodecs` to `<0.16` (\#932).
->>>>>>> drop-python-3-10
 
 # 1.5.0 (a0 prerelease)