From bc3a995360e6478a29becef3e2f2319aad7ef33a Mon Sep 17 00:00:00 2001
From: "John S. Urban" <urbanjost@comcast.net>
Date: Sun, 8 Aug 2021 12:00:36 -0400
Subject: replace lines deleted by conflict

---
 src/fpm/cmd/new.f90 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/fpm/cmd/new.f90 b/src/fpm/cmd/new.f90
index abc1d67..0d57a59 100644
--- a/src/fpm/cmd/new.f90
+++ b/src/fpm/cmd/new.f90
@@ -98,6 +98,9 @@ character(len=:,kind=tfc),allocatable :: littlefile(:)
     ! like realpath() or getcwd().
     bname=basename(settings%name)
 
+    ! create NAME/.gitignore file
+        call warnwrite(join_path(settings%name, '.gitignore'), ['build/*'])
+
     littlefile=[character(len=80) :: '# '//bname, 'My cool new project!']
 
     ! create NAME/README.md
-- 
cgit v1.2.3