diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-07-09 18:32:01 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-07-09 18:32:01 +0100 |
| commit | 4bfaee17fd986cb2cc901036058661cfe1f5c093 (patch) | |
| tree | 38871d383c080618af200ac209eaefaf6612379a /lib | |
| parent | c3b09524a73fd362d5ac1c2080639ad95b0456b2 (diff) | |
| download | gitano-4bfaee17fd986cb2cc901036058661cfe1f5c093.tar.gz | |
Fix an oopsie from the merge
Diffstat (limited to 'lib')
| -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] |