From 5c7ad1ecb1971fad268dce0040d6e9d597dcef31 Mon Sep 17 00:00:00 2001
From: minqiyang <minqiyang@baidu.com>
Date: Fri, 14 Dec 2018 14:33:49 +0800
Subject: [PATCH] Resolve conflicts

test=develop
---
 python/paddle/fluid/layers/nn.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python/paddle/fluid/layers/nn.py b/python/paddle/fluid/layers/nn.py
index bc8e3e8a3c5..28cb700f82c 100644
--- a/python/paddle/fluid/layers/nn.py
+++ b/python/paddle/fluid/layers/nn.py
@@ -9179,6 +9179,7 @@ def psroi_pool(input,
         })
     return out
 
+
 def huber_regression_loss(input, label, delta):
     """
     Huber regression loss is a loss function used in robust regression.
-- 
GitLab