From eb3846236e7d2b4af59aafd66b115e612ab5f679 Mon Sep 17 00:00:00 2001
From: kubajj <vilouskubajj@gmail.com>
Date: Fri, 26 Mar 2021 23:46:00 +0100
Subject: Resolve merge conflict

---
 fpm/src/fpm.f90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 
-- 
cgit v1.2.3