diff options
| author | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
|---|---|---|
| committer | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
| commit | 602bed85f2b32733f73e2edddb542fa36baac462 (patch) | |
| tree | 06a6ee9b609a9122bc2f0e6f6e6300f9ba79a3aa /store/sql_user_store.go | |
| parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
| parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
| download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip | |
fix conflict
Diffstat (limited to 'store/sql_user_store.go')
| -rw-r--r-- | store/sql_user_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 52d670d56..778df367e 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -325,9 +325,9 @@ func (s SqlUserStore) GetEtagForProfiles(teamId string) StoreChannel { updateAt, err := s.GetReplica().SelectInt("SELECT UpdateAt FROM Users WHERE TeamId = :TeamId ORDER BY UpdateAt DESC LIMIT 1", map[string]interface{}{"TeamId": teamId}) if err != nil { - result.Data = fmt.Sprintf("%v.%v", model.ETAG_ROOT_VERSION, model.GetMillis()) + result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, model.GetMillis()) } else { - result.Data = fmt.Sprintf("%v.%v", model.ETAG_ROOT_VERSION, updateAt) + result.Data = fmt.Sprintf("%v.%v", model.CurrentVersion, updateAt) } storeChannel <- result |