From 02c5ecc334d282ceeafae81ab835444fb40e4445 Mon Sep 17 00:00:00 2001
From: xutianbing <xutianbing@baidu.com>
Date: Tue, 7 Feb 2017 11:08:42 -0800
Subject: [PATCH] merge

---
 paddle/function/BufferArg.h    | 2 +-
 paddle/function/FunctionTest.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/paddle/function/BufferArg.h b/paddle/function/BufferArg.h
index f7df56846f6..0dc7792f646 100644
--- a/paddle/function/BufferArg.h
+++ b/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;
   }
 
diff --git a/paddle/function/FunctionTest.h b/paddle/function/FunctionTest.h
index 076aace14cc..0cfafdb27f5 100644
--- a/paddle/function/FunctionTest.h
+++ b/paddle/function/FunctionTest.h
@@ -134,7 +134,6 @@ public:
                                     output.valueType(),
                                     output.shape(),
                                     argType));
-<<<<<<< HEAD
   }
 
   /// add and init output sparse matrix
-- 
GitLab