From 5b24583f63ff25f9f652bd1a1d9e9bc3f930f263 Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Fri, 3 Mar 2017 15:12:42 +0800
Subject: [PATCH] fix merge conflict

---
 python/paddle/v2/event.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/python/paddle/v2/event.py b/python/paddle/v2/event.py
index 8cbf9b9b1fa..a429e36b63c 100644
--- a/python/paddle/v2/event.py
+++ b/python/paddle/v2/event.py
@@ -53,9 +53,8 @@ class EndPass(WithMetric):
     Event On One Pass Training Complete.
     """
 
-    def __init__(self, pass_id, cost, evaluator):
+    def __init__(self, pass_id, evaluator):
         self.pass_id = pass_id
-        self.cost = cost
         WithMetric.__init__(self, evaluator)
 
 
-- 
GitLab