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, 1 insertions, 0 deletions
diff --git a/includes/lapack.h b/includes/lapack.h
index d3f6cb3..c5e4e68 100644
--- a/includes/lapack.h
+++ b/includes/lapack.h
@@ -186,6 +186,7 @@ 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*);