# Conflicts:
#	target/test-classes/com/kjj/qa/cases/Article.class
#	target/test-classes/com/kjj/qa/cases/Novice.class
#	target/test-classes/com/kjj/qa/config/BasicConfig.class
#	target/test-classes/com/kjj/qa/utils/NetworkUtil.class

Test/20200628 test

See merge request test-group/kejiji!11

# Conflicts:
#	src/test/java/com/kjj/qa/config/BasicConfig.java

# Conflicts:
#	src/test/java/com/kjj/qa/config/BasicConfig.java

Test/20200623 test

See merge request test-group/kejiji!9

# Conflicts:
#	src/test/java/com/kjj/qa/config/BasicConfig.java
#	target/test-classes/com/kjj/qa/cases/SellerCard.class
#	target/test-classes/com/kjj/qa/cases/Upload.class
#	target/test-classes/com/kjj/qa/utils/NetworkUtil.class
#	test-output/report.html