Skip to content
Snippets Groups Projects
Commit 453b3b84 authored by Joan He's avatar Joan He
Browse files

MAGETWO-46577: HTTPS header options configuration test

- resolve merge conflict
parent c695079e
No related merge requests found
......@@ -277,7 +277,7 @@
"type": "zip",
"url": "https://api.github.com/repos/magento/composer/zipball/1be267e71debac6e0d9fae4e5144f6095cffbe89",
"reference": null,
"shasum": "6bfdbff4c23aace1e6d14ab598c81c790375aba0"
"shasum": "79156c3e7317af1ff64a482ba90ec81c66b82c73"
},
"require": {
"composer/composer": "1.0.0-alpha10",
......@@ -381,12 +381,12 @@
"source": {
"type": "git",
"url": "https://github.com/magento/zf1.git",
"reference": "c9d607bfd9454bc18b9deff737ccd5d044e2ab10"
"reference": "dbdf178992bfa52d6e978e62131162301ff6b76f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/magento/zf1/zipball/c9d607bfd9454bc18b9deff737ccd5d044e2ab10",
"reference": "c9d607bfd9454bc18b9deff737ccd5d044e2ab10",
"reference": "dbdf178992bfa52d6e978e62131162301ff6b76f",
"shasum": ""
},
"require": {
......@@ -420,7 +420,7 @@
"ZF1",
"framework"
],
"time": "2015-10-29 14:34:55"
"time": "2015-09-30 13:04:03"
},
{
"name": "monolog/monolog",
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment