From be047b5d1882dde3cc17d512d2f4660a0c85f7df Mon Sep 17 00:00:00 2001
From: sunyanfang01 <sunyanfang01@baidu.com>
Date: Wed, 20 May 2020 18:18:12 +0800
Subject: [PATCH] fic

---
 paddlex/interpret/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/paddlex/interpret/__init__.py b/paddlex/interpret/__init__.py
index ca2695b..55c92c9 100644
--- a/paddlex/interpret/__init__.py
+++ b/paddlex/interpret/__init__.py
@@ -16,8 +16,4 @@ from __future__ import absolute_import
 from . import visualize
 
 lime = visualize.lime
-<<<<<<< HEAD
 normlime = visualize.normlime
-=======
-normlime = visualize.normlime
->>>>>>> 092ff478a435193ca13c62b37c5374788e48e142
-- 
GitLab