diff options
| author | kubajj <vilouskubajj@gmail.com> | 2021-03-26 23:46:00 +0100 |
|---|---|---|
| committer | kubajj <vilouskubajj@gmail.com> | 2021-03-26 23:46:00 +0100 |
| commit | eb3846236e7d2b4af59aafd66b115e612ab5f679 (patch) | |
| tree | f9db3e6ccde762cb1028d87693c2c430b6c0501e | |
| parent | e70ce36a74cfd6d29c552140bc979377881147f6 (diff) | |
| download | fpm-eb3846236e7d2b4af59aafd66b115e612ab5f679.tar.gz fpm-eb3846236e7d2b4af59aafd66b115e612ab5f679.zip | |
Resolve merge conflict
| -rw-r--r-- | fpm/src/fpm.f90 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90 index ac306b4..c75b50a 100644 --- a/fpm/src/fpm.f90 +++ b/fpm/src/fpm.f90 @@ -45,12 +45,12 @@ subroutine build_model(model, settings, package, error) character(len=:), allocatable :: manifest, lib_dir logical :: duplicates_found = .false. + type(string_t) :: include_dir if(settings%verbose)then write(*,*)'<INFO>BUILD_NAME:',settings%build_name write(*,*)'<INFO>COMPILER: ',settings%compiler endif - type(string_t) :: include_dir model%package_name = package%name |