merge fix

This commit is contained in:
peter
2019-08-27 19:26:07 +02:00
3 changed files with 10 additions and 262 deletions
-1
View File
@@ -26,7 +26,6 @@
"child-process-promise": "^2.2.1",
"debug": "^4.1.1",
"express": "^4.16.4",
"frontblock": "^0.14.0",
"frontblock-generic": "^0.30.1",
"git-cherrypicker": "0.0.3",
"git-describe": "^4.0.4",