Fix merge

a41faa33 · Jamie Oliver · 76f1f6f9 · a41faa33 · a41faa33
Commit a41faa33 authored 11 years ago by Jamie Oliver
--- a/lib/gollum-lib.rb
+++ b/lib/gollum-lib.rb
@@ -6,7 +6,7 @@ require 'ostruct'
  
 # external
 require 'grit'
-require File.expand_path('../gollum/grit_ext', __FILE__)
+require File.expand_path('../gollum-lib/grit_ext', __FILE__)
 require 'github/markup'
 require 'sanitize'
  

--- a/lib/gollum/grit_ext.rb
+++ b/lib/gollum/grit_ext.rb