修正测试用例

tb/shinTest/testcase/environment.py

@@ -184,23 +184,15 @@ def __GenDevice(id, TerminateNode = False, diffclk = False):
         dout_code = ""
         din_code = "1'b0"
         
-    
-    #clk = "clock"
     clk = "multiCLK[0]"
     multiclk = "multiCLK"
     if diffclk:
-        #clk = "clock2"
         clk = "multiCLK2[0]"
         multiclk = "multiCLK2"
         
     code_device = ("\tShinTop s_ShinTop_slv%d(\n"%(id, )
-<<<<<<< HEAD
-        +"\t.clock(%s),\n"%(clk, )
-        +"\t.reset(reset | isSoftReset[%d]),\n\n"%(id + 1,)
-=======
         +"\t.clock(clock),\n"
         +"\t.reset(reset | isSoftReset_reg[%d]),\n\n"%(id + 1,)
->>>>>>> mp_eb_dev
 
         +"\t.io_multiCLK_0(%s[0]),\n"%(multiclk, )
         +"\t.io_multiCLK_1(%s[1]),\n"%(multiclk, )