aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinit current directory[i] <urbanjost@comcast.net>2020-09-22 08:59:54 -0400
committerinit current directory[i] <urbanjost@comcast.net>2020-10-01 01:01:18 -0400
commit69f5a713223281f7d5f5cef8ea552a37ce6812b3 (patch)
treecc86fbf03d22f83b2e69e6e0e614bba68680f482
parentf5add19149e88bcb5f1d2bed2d940d4c0bf4c406 (diff)
downloadfpm-69f5a713223281f7d5f5cef8ea552a37ce6812b3.tar.gz
fpm-69f5a713223281f7d5f5cef8ea552a37ce6812b3.zip
fix fpm.toml version reference
-rw-r--r--fpm/fpm.toml10
1 files changed, 0 insertions, 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