fix conflict (#4883)

8 years ago · 521514da36
parent 164898277c
commit 521514da36
1 changed files with 1 additions and 1 deletions
--- 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"),