From 860e5d483cd952ec833c40312a2141bb3e4ef579 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 29 May 2017 15:46:35 -0400
Subject: PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection
 timeout setting (#6410)

* Update gorp to mattermost fork and add connection timeout setting

* Add go dependency

* Rename from connection timeout to query timeout

* Properly add gorp dependency
---
 store/sql_preference_store.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'store/sql_preference_store.go')

diff --git a/store/sql_preference_store.go b/store/sql_preference_store.go
index 1ee7c4297..231da069a 100644
--- a/store/sql_preference_store.go
+++ b/store/sql_preference_store.go
@@ -5,7 +5,7 @@ package store
 
 import (
 	l4g "github.com/alecthomas/log4go"
-	"github.com/go-gorp/gorp"
+	"github.com/mattermost/gorp"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
 )
-- 
cgit v1.2.3-1-g7c22