From e0bad6c03784d44210760577550be585daf513b9 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 21 Jul 2015 12:52:38 -0800
Subject: Fixing merge

---
 store/sql_team_store.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/store/sql_team_store.go b/store/sql_team_store.go
index 73d603151..cd0f677aa 100644
--- a/store/sql_team_store.go
+++ b/store/sql_team_store.go
@@ -5,6 +5,7 @@ package store
 
 import (
 	"github.com/mattermost/platform/model"
+	"github.com/mattermost/platform/utils"
 )
 
 type SqlTeamStore struct {
@@ -40,7 +41,7 @@ func (s SqlTeamStore) UpgradeSchemaIfNeeded() {
 }
 
 func (s SqlTeamStore) CreateIndexesIfNotExists() {
-	s.CreateIndexIfNotExists("idx_teams_domain", "Teams", "Domain")
+	s.CreateIndexIfNotExists("idx_teams_name", "Teams", "Name")
 }
 
 func (s SqlTeamStore) Save(team *model.Team) StoreChannel {
-- 
cgit v1.2.3-1-g7c22