From 94618d8776229254d52075f9aabd998d7ed6be8d Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Mon, 16 Jan 2017 10:20:26 +0800
Subject: [PATCH] Fix merge error.

---
 paddle/math/SparseRowMatrix.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paddle/math/SparseRowMatrix.h b/paddle/math/SparseRowMatrix.h
index d7dfb2fe579..c05fc98ff9f 100644
--- a/paddle/math/SparseRowMatrix.h
+++ b/paddle/math/SparseRowMatrix.h
@@ -19,8 +19,8 @@ limitations under the License. */
 #include <algorithm>
 #include "Matrix.h"
 #include "RowBuffer.h"
-#include "paddle/utils/CommandLineParser.h"
 #include "paddle/utils/Util.h"
+
 DECLARE_bool(allow_inefficient_sparse_update);
 
 namespace paddle {
-- 
GitLab