fix merge miss

mayaeh · May 3, 2024 · 7178bbb · 7178bbb
1 parent ec12a3f
commit 7178bbb
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -949,12 +949,3 @@ DEPENDENCIES
   webpacker (~> 5.4)
   webpush!
   xorcist (~> 1.1)
-<<<<<<< HEAD
-=======
-
-RUBY VERSION
-   ruby 3.3.1p55
-
-BUNDLED WITH
-   2.5.9
->>>>>>> main