add

537f6f93 · 钱雯君 · e77bf0be · 537f6f93
Commit 537f6f93 authored Nov 20, 2018 by 钱雯君
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

pk_开奖_瓜分红包测试.java src/test/java/http/cases/PkTest/pk_开奖_瓜分红包测试.java +0 -4

No files found.
--- a/src/test/java/http/cases/PkTest/pk_开奖_瓜分红包测试.java
+++ b/src/test/java/http/cases/PkTest/pk_开奖_瓜分红包测试.java
@@ -62,12 +62,8 @@ public class pk_开奖_瓜分红包测试 extends DuibaTestBase {


    @BeforeMethod
-<<<<<<< HEAD
    //注意初始化的方法不能与父类的相同，会被覆盖住
    public void setUpPkActivity() {
-=======
-    public void beforeMethod() {
->>>>>>> f87a2c6084a3908a60a5357c6907d3fbe4887970

        try {
            createPk("2","2020-08-12 00:00:00",groupId);