aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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