Merge branch 'v4' of github.com:spatie/browsershot into v4

spatie · Dec 29, 2023 · 598b998 · 598b998
2 parents bf0307c + 81741a1
commit 598b998
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -320,7 +320,6 @@
 
 All notable changes to `Browsershot` will be documented in this file
 
-<<<<<<< HEAD
 ## 3.52.0 - 2021-10-27
 
 - Prevent unsuccessful response by @mikaelpopowicz in https://github.com/spatie/browsershot/pull/576