Resolve conflicts

test=develop

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.