aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinit current directory[i] <urbanjost@comcast.net>2020-09-25 14:58:17 -0400
committerinit current directory[i] <urbanjost@comcast.net>2020-10-01 01:01:19 -0400
commit607bd56a1ca8dbb43ea4ea3bcd8088cbb9c28c07 (patch)
treebf0f94e1c3373750749303222c848a999e226064
parent52c096a7a828024aff66e159f8b1f0a5f4414a5e (diff)
downloadfpm-607bd56a1ca8dbb43ea4ea3bcd8088cbb9c28c07.tar.gz
fpm-607bd56a1ca8dbb43ea4ea3bcd8088cbb9c28c07.zip
change quoting of -- ARGS values for more platform independence and change test accordingly
-rw-r--r--fpm/fpm.toml12
1 files changed, 0 insertions, 12 deletions
diff --git a/fpm/fpm.toml b/fpm/fpm.toml
index 425ed61..d0cff7a 100644
--- a/fpm/fpm.toml
+++ b/fpm/fpm.toml
@@ -12,10 +12,7 @@ tag = "v0.2"
[dependencies.M_CLI2]
git = "https://github.com/urbanjost/M_CLI2.git"
-<<<<<<< HEAD
rev = "5c7df1267c918ec2b1b8e2c6a0ac000367b562cf"
-=======
-rev = "a177b0077819571815fa6a8da6980bcb45443858"
[[test]]
name = "cli-test"
@@ -26,12 +23,3 @@ main = "cli_test.f90"
name = "fpm-test"
source-dir = "test/fpm_test"
main = "main.f90"
->>>>>>> try one more like previous build to clear error
-
-
-[[test]]
-name = "fpm-test"
-source-dir = "test/fpm_test"
-main = "main.f90"
-
-