From 13d21d04a958c691cf2d66df56d7a3ac6fd889b7 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Sat, 4 Mar 2017 18:38:10 +0800
Subject: [PATCH] Fix merged error

---
 python/paddle/v2/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/paddle/v2/__init__.py b/python/paddle/v2/__init__.py
index 0ec7e8a4543..06264292919 100644
--- a/python/paddle/v2/__init__.py
+++ b/python/paddle/v2/__init__.py
@@ -44,5 +44,5 @@ def init(**kwargs):
 
     api.initPaddle(*args)
 
-infer = inferencer.infer
-batch = minibatch.batch
\ No newline at end of file
+infer = inference.infer
+batch = minibatch.batch
-- 
GitLab