don't use phing

2019-06-05 11:11:18 +02:00
parent ac8c31e525
commit 13c4e1baf8
5 changed files with 3 additions and 191 deletions
--- a/composer.json
+++ b/composer.json
@@ -47,8 +47,7 @@
 	},
 	"require-dev" : {
 		"wapmorgan/php-code-analyzer" : "^1.0",
-		"phpunit/phpunit" : "~8.1",
-		"phing/phing" : "~2.16"
+		"phpunit/phpunit" : "~8.1"
 	},
 	"config" : {
 		"bin-dir" : "bin"
@@ -69,16 +68,5 @@
 				]
 			}
 		}
-<<<<<<< HEAD
-	},
-	"repositories" : [{
-			"type" : "git",
-			"url" : "https://github.com/magdev/console-form.git",
-			"name" : "magdev/console-form"
-		}
-	],
-	"minimum-stability" : "stable"
-=======
 	}
->>>>>>> refs/heads/master
 }