Update Gemfile.lock to remove actionmailer dependency

The actionmailer dependency was removed from solid_errors in the Gemfile.lock. This change ensures compatibility and reflects the updated requirements of the gem. Corrected an incorrect choice in a merge conflict

Author: imageaid

Gemfile.lock

@@ -2,7 +2,6 @@ PATH
   remote: .
   specs:
     solid_errors (0.6.1)
-      actionmailer (>= 7.0)
       actionpack (>= 7.0)
       actionview (>= 7.0)
       activerecord (>= 7.0)