From 5d198cdaa7d3e821899fb4fdf7380ef7f56a19bb Mon Sep 17 00:00:00 2001
From: sunyanfang01 <sunyanfang01@baidu.com>
Date: Wed, 3 Jun 2020 17:13:29 +0800
Subject: [PATCH] fix the conflict

---
 paddlex/cv/models/slim/prune.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/paddlex/cv/models/slim/prune.py b/paddlex/cv/models/slim/prune.py
index a4a209b..ad4dec2 100644
--- a/paddlex/cv/models/slim/prune.py
+++ b/paddlex/cv/models/slim/prune.py
@@ -281,14 +281,8 @@ def get_params_ratios(sensitivities_file, eval_metric_loss=0.05):
     if not osp.exists(sensitivities_file):
         raise Exception('The sensitivities file is not exists!')
     sensitivitives = paddleslim.prune.load_sensitivities(sensitivities_file)
-<<<<<<< HEAD
     params_ratios = paddleslim.prune.get_ratios_by_loss(
         sensitivitives, eval_metric_loss)
-    
-=======
-    params_ratios = paddleslim.prune.get_ratios_by_loss(sensitivitives,
-                                                        eval_metric_loss)
->>>>>>> 7df89bb4e3e8cca1c9c57bf5f316fc9eb873a149
     return params_ratios
 
 
-- 
GitLab