Update Gemfile.lock

marmila · Apr 9, 2024 · e6c9412 · e6c9412
1 parent e8b6ba1
commit e6c9412
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
@@ -40,11 +40,7 @@ GEM
     ffi (1.16.3)
     forwardable-extended (2.6.0)
     gemoji (4.1.0)
-<<<<<<< HEAD
-    github-pages (230)
-=======
     github-pages (231)
->>>>>>> upstream/master
       github-pages-health-check (= 1.18.2)
       jekyll (= 3.9.5)
       jekyll-avatar (= 0.8.0)