replace lines deleted by conflict

Author: urbanjost

src/fpm/cmd/new.f90

@@ -98,6 +98,9 @@ subroutine cmd_new(settings)
     ! 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