diff options
| author | Pjotr Prins | 2018-06-29 12:56:08 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2018-06-29 12:56:08 +0000 |
| commit | 1c2dbad9b627b67ff91158480335d499106b4e50 (patch) | |
| tree | 6554e972f830de5e377b45d8d9d07b9612edee12 /src/bslmmdap.cpp | |
| parent | cee92876e456299e14afd51e0b719384c48c5286 (diff) | |
| parent | 9f9887eb5befe025e85641f1930e46e5e6a25e56 (diff) | |
| download | pangemma-1c2dbad9b627b67ff91158480335d499106b4e50.tar.gz | |
Fix conflict
Diffstat (limited to 'src/bslmmdap.cpp')
| -rw-r--r-- | src/bslmmdap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bslmmdap.cpp b/src/bslmmdap.cpp index e9900e3..6220bb5 100644 --- a/src/bslmmdap.cpp +++ b/src/bslmmdap.cpp @@ -39,7 +39,7 @@ #include "gsl/gsl_vector.h" #include "bslmmdap.h" -#include "io.h" +#include "gemma_io.h" #include "lapack.h" #include "lm.h" #include "lmm.h" |