last change
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/ru/telran/sel/LoginTests.java
	src/test/resources/testng.xml
	target/test-classes/testng.xml
	test-output/Tests/Test1.html
	test-output/Tests/Test1.xml
	test-output/Tests/testng-failed.xml
	test-output/emailable-report.html
	test-output/index.html
	test-output/junitreports/TEST-ru.telran.sel.LoginTests.xml
	test-output/old/Tests/groups.html
	test-output/old/Tests/methods-alphabetical.html
	test-output/old/Tests/methods-not-run.html
	test-output/old/Tests/methods.html
	test-output/old/Tests/testng.xml.html
	test-output/old/index.html
	test-output/testng-failed.xml
	test-output/testng-results.xml

last change
Merge branch 'master' of https://github.com/yacov/ru.remonline.test

Conflicts:
	src/test/java/ru/telran/sel/LoginTests.java
	src/test/resources/testng.xml
	target/test-classes/testng.xml