summaryrefslogtreecommitdiff
path: root/includes/lapack.h
diff options
context:
space:
mode:
Diffstat (limited to 'includes/lapack.h')
-rw-r--r--includes/lapack.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/includes/lapack.h b/includes/lapack.h
index c5e4e680..d3f6cb32 100644
--- a/includes/lapack.h
+++ b/includes/lapack.h
@@ -186,7 +186,6 @@ extern int dggbal_(char*,int*,double*,int*,double*,int*,int*,int*,double*, \
double*,double*,int*);
extern int dgebak_(char*,char*,int*,int*,int*,double*,int*,double*,int*,int*);
-<<<<<<< HEAD
/*Used in SVD */
extern double dgesvd_(char*,char*,int*,int*,double*,int*,double*,double*,int*,\
double*,int*,double *,int*,int*);