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 /Godeps/Godeps.json | |
parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip |
fix conflict
Diffstat (limited to 'Godeps/Godeps.json')
-rw-r--r-- | Godeps/Godeps.json | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 7a037e6ab..d6503a1d5 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -13,6 +13,11 @@ "Rev": "69e2a90ed92d03812364aeb947b7068dc42e561e" }, { + "ImportPath": "code.google.com/p/graphics-go/graphics", + "Comment": "null-25", + "Rev": "f843bfcd8ac420072c7f6804599995b0a229070b" + }, + { "ImportPath": "code.google.com/p/log4go", "Comment": "go.weekly.2012-02-22-1", "Rev": "c3294304d93f48a37d3bed1d382882a9c2989f99" @@ -88,6 +93,14 @@ "Rev": "dc93e1b98c579d90ee2fa15c1fd6dac34f6e7899" }, { + "ImportPath": "github.com/rwcarlsen/goexif/exif", + "Rev": "709fab3d192d7c62f86043caff1e7e3fb0f42bd8" + }, + { + "ImportPath": "github.com/rwcarlsen/goexif/tiff", + "Rev": "709fab3d192d7c62f86043caff1e7e3fb0f42bd8" + }, + { "ImportPath": "github.com/stretchr/objx", "Rev": "cbeaeb16a013161a98496fad62933b1d21786672" }, |