添加规则任务、修改规则任务

app/JsonRpc/CollectorService.php

@@ -170,17 +170,10 @@ class CollectorService implements CollectorServiceInterface
                             'name' => $data['name'],
                             'web_id' => $data['web_id'],
                             'first_url' => $data['first_url'],
-<<<<<<< HEAD
                             'parameter' => $data['parameter'],
                             'start' => $data['start'],
                             'title' => $data['title'],
                             'content' => $data['content']
-=======
-                            'parameter' => $data['second_start'],
-                            'start' => $data['second_num'],
-                            'title' => $data['second_end'],
-                            'content' => $data['start']
->>>>>>> e4885d7b505b4e8a167ccf93db3f2368c0b661a7
                         ];  
                         // var_dump("============2============");       
                         break;