From ea40c62f0aed1b2b4db2ee632e4044a81167010a Mon Sep 17 00:00:00 2001
From: x54-729 <17307130121@fudan.edu.cn>
Date: Thu, 30 Jun 2022 06:38:11 +0000
Subject: [PATCH] fix conflict

---
 fastNLP/envs/imports.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fastNLP/envs/imports.py b/fastNLP/envs/imports.py
index c0ffffa3..08afc6a5 100644
--- a/fastNLP/envs/imports.py
+++ b/fastNLP/envs/imports.py
@@ -22,10 +22,7 @@ _NEED_IMPORT_FAIRSCALE = not _IS_WINDOWS and _module_available("fairscale") and
 _NEED_IMPORT_TORCH = _module_available("torch") and 'torch' in need_import
 _NEED_IMPORT_JITTOR = _module_available("jittor") and 'jittor' in need_import
 _NEED_IMPORT_PADDLE = _module_available("paddle") and 'paddle' in need_import
-<<<<<<< HEAD
 _NEED_IMPORT_DEEPSPEED = _module_available("deepspeed") and 'torch' in need_import
-=======
 _NEED_IMPORT_ONEFLOW = _module_available("oneflow") and 'oneflow' in need_import
->>>>>>> dev0.8.0
 
 _TORCH_GREATER_EQUAL_1_8 = _NEED_IMPORT_TORCH and _compare_version("torch", operator.ge, "1.8.0")