Skip to content

S
soar

六月暴雪飞梨花 / soar
与 Fork 源项目一致

Fork自 Xiaomi / soar

通知 1
Star 0
Fork 0
S
soar

体验新版 GitCode，发现更多精彩内容 >>

提交 2417c27d 编写于 作者: martianzhang's avatar martianzhang
浏览文件
操作

resolve conflict

上级 296d7e45
隐藏空白更改
内联 并排
Showing with 0 addition and 35 deletion
vendor/vendor.json
浏览文件 @ 2417c27d
...@@ -173,79 +173,44 @@ ...@@ -173,79 +173,44 @@
{ {
"checksumSHA1": "MxoLdFWi8nwd0uqTJnYqw+JaDAY=", "checksumSHA1": "MxoLdFWi8nwd0uqTJnYqw+JaDAY=",
"path": "github.com/pingcap/tidb/sessionctx/stmtctx", "path": "github.com/pingcap/tidb/sessionctx/stmtctx",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "wlD7aGqTJ5eBQYK0ub4b2Ick1j8=", "checksumSHA1": "wlD7aGqTJ5eBQYK0ub4b2Ick1j8=",
"path": "github.com/pingcap/tidb/types", "path": "github.com/pingcap/tidb/types",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=", "checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=",
"path": "github.com/pingcap/tidb/types/json", "path": "github.com/pingcap/tidb/types/json",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=", "checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=",
"path": "github.com/pingcap/tidb/types/parser_driver", "path": "github.com/pingcap/tidb/types/parser_driver",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "SS7twHZofFKr8w/pwIKmkp3u5qU=", "checksumSHA1": "SS7twHZofFKr8w/pwIKmkp3u5qU=",
"path": "github.com/pingcap/tidb/util/execdetails", "path": "github.com/pingcap/tidb/util/execdetails",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=", "checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=",
"path": "github.com/pingcap/tidb/util/hack", "path": "github.com/pingcap/tidb/util/hack",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=", "checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=",
"path": "github.com/pingcap/tidb/util/memory", "path": "github.com/pingcap/tidb/util/memory",
<<<<<<< HEAD
"revision": "78a51a4626999279749c460f3f42a2e92897c2e3", "revision": "78a51a4626999279749c460f3f42a2e92897c2e3",
"revisionTime": "2019-01-05T13:32:32Z" "revisionTime": "2019-01-05T13:32:32Z"
=======
"revision": "081a2c5cccf4d82ca2ad33cdc9f2f21d3319e2d5",
"revisionTime": "2019-01-05T02:32:10Z"
>>>>>>> master
}, },
{ {
"checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=", "checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或