diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
| commit | 6d6cada0970a2b341f36dac9b0fed8262ada1865 (patch) | |
| tree | fc3728f15deaebd0c870838a63735659a33456e7 /manualtesting | |
| parent | 0b986ed3147c885af6b2f33e1ff3eb6754e8f274 (diff) | |
| parent | a341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff) | |
| download | chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.gz chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.bz2 chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.zip | |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'manualtesting')
| -rw-r--r-- | manualtesting/manual_testing.go | 2 | ||||
| -rw-r--r-- | manualtesting/test_autolink.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index b3d01a5a6..befc835fb 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -4,7 +4,7 @@ package manualtesting import ( - l4g "code.google.com/p/log4go" + l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/api" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" diff --git a/manualtesting/test_autolink.go b/manualtesting/test_autolink.go index a13ec7a75..16d2d713a 100644 --- a/manualtesting/test_autolink.go +++ b/manualtesting/test_autolink.go @@ -4,7 +4,7 @@ package manualtesting import ( - l4g "code.google.com/p/log4go" + l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/model" ) |