1
1
1
Merge branch 'dev'

Conflicts:
	src/test/java/org/hq/autotest/framework/test/TestNew.java
1
1
1
1
Merge branch 'dev1'

Conflicts:
	src/test/java/org/hq/autotest/framework/test/TestNew.java
Merge branch 'dev2'

Conflicts:
	src/test/java/org/hq/autotest/framework/test/TestNew.java