fix for aarch64 on 6.1

Signed-off-by: Sebastian Gottschall <[email protected]>
BrainSlayer · Oct 1, 2023 · cc71b3c · cc71b3c
1 parent bec9235
commit cc71b3c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/lib/libspl/include/assert.h b/lib/libspl/include/assert.h
@@ -160,7 +160,6 @@ do {									\
 		    "%s == 0 (0x%llx == 0)", #LEFT,			\
 		    (u_longlong_t)__left);				\
 } while (0)
-<<<<<<< HEAD
 
 #define	VERIFY0P(LEFT)							\
 do {									\
@@ -170,10 +169,8 @@ do {									\
 		    "%s == 0 (%p == 0)", #LEFT,				\
 		    (void *)__left);					\
 } while (0)
-
-=======
 #endif
->>>>>>> 64ff1e384 (disable debug bloat)
+
 #ifdef assert
 #undef assert
 #endif