-
https://github.com/PaddlePaddle/Paddle由 yangyaming 提交于
Conflicts: doc/api/v2/fluid/layers.rst python/paddle/v2/fluid/layers/nn.py python/paddle/v2/fluid/tests/test_layers.py
8c81439e
Conflicts: doc/api/v2/fluid/layers.rst python/paddle/v2/fluid/layers/nn.py python/paddle/v2/fluid/tests/test_layers.py