Merge conflict with develop branch
Showing
![doc/howto/usage/k8s/src/k8s-paddle-arch.png](https://gitcode.net/qq_43081702/Paddle/-/raw/1164c287b9db46abd9e591ddebe720bc3e08e22d/doc/howto/usage/k8s/src/k8s-paddle-arch.png)
| W: | H:
| W: | H:
![doc/howto/usage/k8s/src/k8s-paddle-arch.png](https://gitcode.net/qq_43081702/Paddle/-/raw/1164c287b9db46abd9e591ddebe720bc3e08e22d/doc/howto/usage/k8s/src/k8s-paddle-arch.png)
![doc/howto/usage/k8s/src/k8s-paddle-arch.png](https://gitcode.net/qq_43081702/Paddle/-/raw/1164c287b9db46abd9e591ddebe720bc3e08e22d/doc/howto/usage/k8s/src/k8s-paddle-arch.png)
python/paddle/v2/config_base.py
0 → 100644
python/paddle/v2/dataset/imdb.py
0 → 100644
python/paddle/v2/inferencer.py
0 → 100644
python/paddle/v2/networks.py
0 → 100644