Skip to content

Commit 5f2281b

Browse files
committed
Correct merge corruption with ">>>>>>> maint" in superlu_ddefs.h (Issue #90)
1 parent a0c2dcd commit 5f2281b

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

SRC/superlu_ddefs.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ extern int superlu_dtrsv(char *uplo, char *trans, char *diag,
637637

638638
#ifdef SLU_HAVE_LAPACK
639639
// LAPACK routine
640-
>>>>>>> maint
641640
extern void dtrtri_(char*, char*, int*, double*, int*, int*);
642641
#endif
643642

0 commit comments

Comments
 (0)