From 5f2281ba1ebe02045c3f326adf1423862b8d92b6 Mon Sep 17 00:00:00 2001
From: Sherry Li <xsli@lbl.gov>
Date: Wed, 15 Dec 2021 15:17:52 -0800
Subject: [PATCH] Correct merge corruption with ">>>>>>> maint" in
 superlu_ddefs.h (Issue #90)

---
 SRC/superlu_ddefs.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SRC/superlu_ddefs.h b/SRC/superlu_ddefs.h
index 7be28e48..5461cf75 100644
--- a/SRC/superlu_ddefs.h
+++ b/SRC/superlu_ddefs.h
@@ -637,7 +637,6 @@ extern int superlu_dtrsv(char *uplo, char *trans, char *diag,
 
 #ifdef SLU_HAVE_LAPACK
 // LAPACK routine
->>>>>>> maint
 extern void dtrtri_(char*, char*, int*, double*, int*, int*);
 #endif