update sass

Author: felix-commits

Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 gem 'jekyll', '~> 4.2', '>= 4.2.2'
 gem 'jekyll-sass-converter', '3.0.0'
 =======
@@ -13,6 +14,8 @@ gem 'jekyll-sass-converter', '~> 2.2'
 >>>>>>> 87d24e0b (Bump jekyll from 4.2.2 to 4.3.3)
 =======
 =======
+=======
+>>>>>>> 56bf668e (update sass)
 gem 'jekyll', '~> 4.4'
 <<<<<<< HEAD
 >>>>>>> d4c360c3 (build(deps): bump jekyll from 4.3.4 to 4.4.0)
@@ -26,7 +29,14 @@ gem 'jekyll-sass-converter', '~> 3.0'
 >>>>>>> f91dd8d8 (Bump jekyll-sass-converter from 2.2.0 to 3.0.0)
 =======
 gem 'jekyll-sass-converter', '~> 3.1'
+<<<<<<< HEAD
 >>>>>>> 31732924 (build(deps): bump jekyll-sass-converter from 3.0.0 to 3.1.0)
+=======
+=======
+gem 'jekyll', '~> 4.2', '>= 4.2.2'
+gem 'jekyll-sass-converter', '3.0.0'
+>>>>>>> b79c10e6 (update sass)
+>>>>>>> 56bf668e (update sass)
 gem 'jekyll-redirect-from', '~> 0.16.0'
 
 group :jekyll_plugins do

Gemfile.lock

@@ -67,11 +67,14 @@ GEM
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     google-protobuf (3.24.4)
 =======
     google-protobuf (4.26.1)
 =======
+=======
+>>>>>>> 56bf668e (update sass)
     google-protobuf (4.29.3)
 =======
     google-protobuf (4.28.2)
@@ -110,7 +113,13 @@ GEM
     google-protobuf (4.29.3-x86_64-linux)
       bigdecimal
       rake (>= 13)
+<<<<<<< HEAD
 >>>>>>> 09836723 (fix: add missing os-specific deps in Gemfile.lock)
+=======
+=======
+    google-protobuf (3.24.4)
+>>>>>>> b79c10e6 (update sass)
+>>>>>>> 56bf668e (update sass)
     http_parser.rb (0.8.0)
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -183,8 +192,13 @@ GEM
       webrick (~> 1.7)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
+<<<<<<< HEAD
     jekyll-sass-converter (3.1.0)
       sass-embedded (~> 1.75)
+=======
+    jekyll-sass-converter (3.0.0)
+      sass-embedded (~> 1.54)
+>>>>>>> b79c10e6 (update sass)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
     json (2.10.1)
@@ -372,10 +386,14 @@ PLATFORMS
     rexml (3.2.6)
     rouge (4.1.3)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc (2.4.0-x64-mingw32)
-      ffi (~> 1.9)
+    sass-embedded (1.69.4-arm64-darwin)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.69.4-x64-mingw32)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.69.4-x86_64-darwin)
+      google-protobuf (~> 3.23)
+    sass-embedded (1.69.4-x86_64-linux-gnu)
+      google-protobuf (~> 3.23)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.5.0)
@@ -395,6 +413,7 @@ DEPENDENCIES
   jekyll-redirect-from (~> 0.16.0)
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   jekyll-sass-converter (= 3.0.0)
   webrick (~> 1.7)
@@ -408,10 +427,19 @@ DEPENDENCIES
 >>>>>>> 26b07d02 (Bump webrick from 1.7.0 to 1.8.1)
 =======
 =======
+=======
+>>>>>>> 56bf668e (update sass)
   jekyll-sass-converter (~> 3.1)
 >>>>>>> 31732924 (build(deps): bump jekyll-sass-converter from 3.0.0 to 3.1.0)
   webrick (~> 1.9)
+<<<<<<< HEAD
 >>>>>>> b37da6fc (build(deps-dev): bump webrick from 1.8.2 to 1.9.0)
+=======
+=======
+  jekyll-sass-converter (= 3.0.0)
+  webrick (~> 1.7)
+>>>>>>> b79c10e6 (update sass)
+>>>>>>> 56bf668e (update sass)
 
 BUNDLED WITH
    2.6.3