From 4bfaee17fd986cb2cc901036058661cfe1f5c093 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Sun, 9 Jul 2017 18:32:01 +0100
Subject: Fix an oopsie from the merge

---
 lib/gitano.lua | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lib')

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]
-- 
cgit v1.2.1