fix an overlooked conflict

CEMeNT-PSAAP · Aug 14, 2024 · 1b51de5 · 1b51de5
1 parent 90033a2
commit 1b51de5
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/mcdc/card.py b/mcdc/card.py
@@ -1,17 +1,13 @@
 import numpy as np
 import sympy
 
-<<<<<<< HEAD
-from mcdc.constant import INF, SHIFT, PI
-=======
 from mcdc.constant import (
     BOOL_AND,
     BOOL_OR,
     BOOL_NOT,
     INF,
     SHIFT,
 )
->>>>>>> dev
 
 # Get the global variable container
 import mcdc.global_ as global_