Amend conflicts

DataDog · Apr 25, 2024 · c1a2b2d · c1a2b2d
1 parent bf37a1e
commit c1a2b2d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,11 +56,8 @@ docker-compose.override.yml
 tests/Sapi/Roadrunner/rr-*
 github-actions-helpers/_build.csproj.DotSettings
 .nuke
-<<<<<<< HEAD
 package.json
 packages.json
 package-lock.json
 yarn.lock
-=======
 cookies.txt
->>>>>>> c6e40947a (Add user event to Laravel 8)