Merge branch 'master' of https://github.com/MillironX/millironx.github.io

4 years ago · f8c9bcc65b
parent 64a4ef4e0d a6ac798b52
commit f8c9bcc65b
1 changed files with 8 additions and 0 deletions
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -59,11 +59,19 @@ GEM
    rb-inotify (0.10.1)
      ffi (~> 1.0)
    rexml (3.2.4)
+<<<<<<< HEAD
    rouge (3.21.0)
    safe_yaml (1.0.5)
    sassc (2.4.0)
      ffi (~> 1.9)
    sassc (2.4.0-x64-mingw32)
+=======
+    rouge (3.15.0)
+    safe_yaml (1.0.5)
+    sassc (2.2.1)
+      ffi (~> 1.9)
+    sassc (2.2.1-x64-mingw32)
+>>>>>>> a6ac798b52f8f25e04e93cb3c8d9f1c8f1ce7e13
      ffi (~> 1.9)
    terminal-table (1.8.0)
      unicode-display_width (~> 1.1, >= 1.1.1)