removed merge conflict residue

fieg · fieg · commit 207a356f18ae · 2023-04-09T15:35:46.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,7 +26,6 @@ This version introduces upwards scroll support (fixes [#466](https://github.com/
 ## [3.0.1]
 
 * Fixed prefill not filling past the scroll threshold
->>>>>>>>> Temporary merge branch 2
 
 ## [3.0.0]
 
