From 607bd56a1ca8dbb43ea4ea3bcd8088cbb9c28c07 Mon Sep 17 00:00:00 2001
From: "init current directory[i]" <urbanjost@comcast.net>
Date: Fri, 25 Sep 2020 14:58:17 -0400
Subject: change quoting of -- ARGS values for more platform independence and
 change test accordingly

---
 fpm/fpm.toml | 12 ------------
 1 file changed, 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"
-
-
-- 
cgit v1.2.3