stringer-rss
diff --git a/‎package.json‎
Lines changed: 7 additions & 0 deletions b/‎package.json‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎pnpm-lock.yaml‎
Lines changed: 16 additions & 0 deletions b/‎pnpm-lock.yaml‎
Lines changed: 16 additions & 0 deletions
@@ -8,6 +8,7 @@
     "@fontsource/lato": "^5.2.7",
     "@fontsource/reenie-beanie": "^5.2.8",
     "@hotwired/stimulus": "^3.2.2",
+<<<<<<< HEAD
     "@hotwired/turbo": "^8.0.23",
     "@hotwired/turbo-rails": "^8.0.23",
     "@rails/actioncable": "^8.1.300",
@@ -18,6 +19,12 @@
     "font-awesome": "4.7.0",
     "mousetrap": "1.4.6",
     "underscore": "1.13.8"
+=======
+    "@hotwired/turbo": "^8.0.21",
+    "@hotwired/turbo-rails": "^8.0.21",
+    "@rails/actioncable": "^8.1.300",
+    "@rails/activestorage": "^8.1.300"
+>>>>>>> 153603a (Update all pnpm dependencies (2026-04-06) (#1398))
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.5",