Skip to content

Commit 9d7fff6

Browse files
author
Maksym Aposov
committed
Merge remote-tracking branch 'mainline/develop' into PR-3
2 parents 8da1b1e + 9880a3a commit 9d7fff6

File tree

2 files changed

+6
-223
lines changed

2 files changed

+6
-223
lines changed

dev/tests/functional/.htaccess

Lines changed: 0 additions & 223 deletions
This file was deleted.

dev/tests/functional/etc/config.xml.dist

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
<appBackendUrl>http://magento2ce.com/admin/</appBackendUrl>
1414
<backendLoginUrl>admin/auth/login</backendLoginUrl>
1515
</application>
16+
<isolation>
17+
<resetUrlPath>dev/tests/functional/isolation.php</resetUrlPath>
18+
<testSuite>none</testSuite>
19+
<testCase>none</testCase>
20+
<test>none</test>
21+
</isolation>
1622
<install>
1723
<host>127.0.0.1</host>
1824
<user>root</user>

0 commit comments

Comments
 (0)