fix conflict (#4883)

521514da · QI JUN · Qiao Longfei · 16489827 · 521514da
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

paddle/operators/momentum_op.cc paddle/operators/momentum_op.cc +1 -1

未找到文件。
--- a/paddle/operators/momentum_op.cc
+++ b/paddle/operators/momentum_op.cc
@@ -22,7 +22,7 @@ class MomentumOp : public framework::OperatorWithKernel {
  using framework::OperatorWithKernel::OperatorWithKernel;

 protected:
-  void InferShape(framework::InferShapeContextBase *ctx) const override {
+  void InferShape(framework::InferShapeContext *ctx) const override {
    PADDLE_ENFORCE(ctx->HasInput("Param"),
                   "Input(param) of Momentum should not be null.");
    PADDLE_ENFORCE(ctx->HasInput("Grad"),