From 69f5a713223281f7d5f5cef8ea552a37ce6812b3 Mon Sep 17 00:00:00 2001
From: "init current directory[i]" <urbanjost@comcast.net>
Date: Tue, 22 Sep 2020 08:59:54 -0400
Subject: fix fpm.toml version reference

---
 fpm/fpm.toml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/fpm/fpm.toml b/fpm/fpm.toml
index 0fcc91c..ee2e714 100644
--- a/fpm/fpm.toml
+++ b/fpm/fpm.toml
@@ -21,17 +21,7 @@ main = "cli_test.f90"
 
 [[test]]
 name = "fpm-test"
-<<<<<<< HEAD
 source-dir = "test/fpm_test"
 main = "main.f90"
 
-=======
-source-dir = "test/main"
-main = "main.f90"
-
-[[test]]
-name = "cli-test"
-source-dir = "test/cli_test"
-main = "cli_test.f90"
->>>>>>> add test program for CLI
 
-- 
cgit v1.2.3