Rebase master

xichen2020 · Dec 7, 2018 · 5987cd3 · 5987cd3
1 parent 5bea22c
commit 5987cd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 20 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -5,17 +5,14 @@ import:
 - package: github.com/m3db/stackmurmur3
 - package: github.com/spaolacci/murmur3
   version: ^1.1
-<<<<<<< HEAD
 - package: github.com/gogo/protobuf
   version: ^1.1.1
   subpackages:
   - protoc-gen-gofast
 - package: github.com/valyala/gozstd
   version: ^1.1.0
-=======
 - package: gopkg.in/yaml.v2
   version: ~2.2.2
->>>>>>> Implement main.
 testImport:
 - package: github.com/stretchr/testify
   version: ^1.2.2