fixing merge conflict

2016-11-09 22:41:34 -08:00
parent 2db15f4e4d 4ff130f138
commit 3ab34f793f
4 changed files with 45 additions and 1 deletions
--- a/2
+++ b/2
@ -1,3 +1,5 @@
 source "https://rubygems.org"

 gem 'github-pages', group: :jekyll_plugins
+gem 'jekyll'
+