Apply template update: 🚨 [security] [ruby] Update action_text-trix 2.1.16 → 2.1.17 (patch)

Source: mockdeep/Rails-Template#1370

Author: Template Bot

Gemfile.lock

@@ -194,7 +194,11 @@ GEM
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
     json (2.19.1)
+<<<<<<< HEAD
     json-schema (6.2.0)
+=======
+    json-schema (6.1.0)
+>>>>>>> 1d22210 (Update action_text-trix to version 2.1.17 (#1370))
       addressable (~> 2.8)
       bigdecimal (>= 3.1, < 5)
     language_server-protocol (3.17.0.5)