merge finished

2025-05-26 12:28:39 +02:00
parent d7a02e7f0d
commit 55accd35b3
20 changed files with 2 additions and 376 deletions
--- a/6
+++ b/6
@ -7,10 +7,7 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-<<<<<<< HEAD
 gem "json"
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 gem "jekyll"
 gem "minimal-mistakes-jekyll"

@ -35,8 +32,5 @@ group :jekyll_plugins do
  gem 'jemoji'
  gem 'jekyll-archives'
  gem 'jekyll-include-cache'
-<<<<<<< HEAD
  gem 'jekyll-webp'
-=======
->>>>>>> d0fa738f (rebase from mnml mistakes source)
 end