diff options
| -rw-r--r-- | lib/gitano.lua | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitano.lua b/lib/gitano.lua index 5354a0f..e2b8e06 100644 --- a/lib/gitano.lua +++ b/lib/gitano.lua @@ -41,11 +41,8 @@ local supple = require 'gitano.supple' local auth = require 'gitano.auth' local plugins = require 'gitano.plugins' local i18n = require 'gitano.i18n' -<<<<<<< HEAD local patterns = require 'gitano.patterns' -======= local hooks = require 'gitano.hooks' ->>>>>>> dsilvers/hooks local _VERSION = {1, 1, 0} _VERSION.major = _VERSION[1] |