From 554f0173270a3d66dd28f0f4cccb09d870d3e5f0 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 22 Sep 2015 13:20:24 -0700
Subject: Fixing merge conflict

---
 model/config.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index 76d449904..1e95277a2 100644
--- a/model/config.go
+++ b/model/config.go
@@ -25,8 +25,8 @@ type ServiceSettings struct {
 	SegmentDeveloperKey        string
 	GoogleDeveloperKey         string
 	EnableOAuthServiceProvider bool
-	EnableTesting              bool
 	EnableIncomingWebhooks     bool
+	EnableTesting              bool
 }
 
 type SSOSettings struct {
-- 
cgit v1.2.3-1-g7c22