merge

paddle/function/BufferArg.h

@@ -190,7 +190,7 @@ public:
       : BufferArg(VALUE_TYPE_INT32, shape, argType) {
     bufferType_ = TENSOR_SEQUENCE_ID;
     CHECK_EQ(shape_.ndims(), 1UL);
-    CHECK_GT(shape_[0], 1UL);
+    CHECK_GE(shape_[0], 1UL);
     numSeqs_ = shape_[0] - 1;
   }
 

paddle/function/FunctionTest.h

@@ -134,7 +134,6 @@ public:
                                     output.valueType(),
                                     output.shape(),
                                     argType));
-<<<<<<< HEAD
   }
 
   /// add and init output sparse matrix