polish code

xdit-project · Dec 26, 2024 · d7b4a69 · d7b4a69
1 parent 45af87e
commit d7b4a69
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/xfuser/core/long_ctx_attention/ring/ring_flash_attn.py b/xfuser/core/long_ctx_attention/ring/ring_flash_attn.py
@@ -11,10 +11,7 @@
 except ImportError:
     flash_attn = None
     _flash_attn_forward = None
-<<<<<<< HEAD
     from yunchang.kernels.attention import pytorch_attn_forward
-=======
->>>>>>> main
 
 def xdit_ring_flash_attn_forward(
     process_group,