*: fix conflict

tikv · Mar 29, 2017 · 12c8c1c · 12c8c1c
2 parents d43fb05 + 1ce6782
commit 12c8c1c
Show file tree

Hide file tree

Showing 71 changed files with 5,595 additions and 30,271 deletions.
diff --git a/_vendor/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go b/_vendor/vendor/github.com/elazarl/go-bindata-assetfs/assetfs.go
diff --git a/_vendor/vendor/github.com/ngaut/deadline/rw.go b/_vendor/vendor/github.com/ngaut/deadline/rw.go