Fix merge master

Controller/Process/Validate3d.php

@@ -101,7 +101,6 @@ class Validate3d extends \Magento\Framework\App\Action\Action
                     $order->getPayment()->setAdditionalInformation('paResponse', $requestPaRes);
 
                     try {
-
                         /**
                          * Magento should allow this.
                          * https://github.com/magento/magento2/issues/5819
@@ -192,4 +191,4 @@ class Validate3d extends \Magento\Framework\App\Action\Action
     {
         return $this->_objectManager->get('Magento\Checkout\Model\Session');
     }
-}
\ No newline at end of file
+}

composer.json

@@ -9,19 +9,19 @@
   ],
   "require": {
     "php": "~5.5.0|~5.6.0|~7.0.0",
-    "magento/module-config": "100.1.*",
-    "magento/module-store": "100.1.*",
-    "magento/module-checkout": "100.1.*",
-    "magento/module-catalog": "101.0.*",
-    "magento/module-sales": "100.1.*",
-    "magento/module-customer": "100.1.*",
-    "magento/module-payment": "100.1.*",
-    "magento/module-quote": "100.1.*",
-    "magento/module-backend": "100.1.*",
-    "magento/module-directory": "100.1.*",
-    "magento/module-theme": "100.1.*",
-    "magento/module-paypal": "100.1.*",
-    "magento/framework": "100.1.*",
+    "magento/module-config": "100.0.*|100.1.*",
+    "magento/module-store": "100.0.*|100.1.*",
+    "magento/module-checkout": "100.0.*|100.1.*",
+    "magento/module-catalog": "100.0.*|101.0.*",
+    "magento/module-sales": "100.0.*|100.1.*",
+    "magento/module-customer": "100.0.*|100.1.*",
+    "magento/module-payment": "100.0.*|100.1.*",
+    "magento/module-quote": "100.0.*|100.1.*",
+    "magento/module-backend": "100.0.*|100.1.*",
+    "magento/module-directory": "100.0.*|100.1.*",
+    "magento/module-theme": "100.0.*|100.1.*",
+    "magento/module-paypal": "100.0.*|100.1.*",
+    "magento/framework": "100.0.*|100.1.*",
     "adyen/php-api-library": "*"
   },
   "autoload": {
@@ -32,4 +32,4 @@
       "Adyen\\Payment\\": ""
     }
   }
-}
\ No newline at end of file
+}

etc/module.xml

@@ -32,4 +32,4 @@
             <module name="Magento_Paypal"/>
         </sequence>
     </module>
-</config>
\ No newline at end of file
+</config>