提交 76a98224 编写于 作者: M MRXLT

fix conflict

...@@ -63,6 +63,7 @@ If Python3 is used, replace `pip` with `pip3`. ...@@ -63,6 +63,7 @@ If Python3 is used, replace `pip` with `pip3`.
## GOPATH Setting ## GOPATH Setting
## Compile Arguments ## Compile Arguments
The default GOPATH is `$HOME/go`, which you can set to other values. The default GOPATH is `$HOME/go`, which you can set to other values.
...@@ -80,6 +81,7 @@ go get -u github.com/golang/protobuf/protoc-gen-go ...@@ -80,6 +81,7 @@ go get -u github.com/golang/protobuf/protoc-gen-go
go get -u google.golang.org/grpc go get -u google.golang.org/grpc
``` ```
## Compile Server ## Compile Server
### Integrated CPU version paddle inference library ### Integrated CPU version paddle inference library
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册