solve conflict

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamicHandle.scala

@@ -106,11 +106,8 @@ trait CompanyDynamicHandle {
     , "company_send_announcement_list" -> "38" // 送达报告
     , "bankruptcy_open_case" -> "39" // 破产重整
     , "company_court_register" -> "40" // 立案信息
-<<<<<<< HEAD
     , "company_annual_report_out_guarantee" -> "41" // 年报-对外担保
-=======
     , "company_zxr_final_case" -> "41" // 终本案件
->>>>>>> fcd162dc0aa27f94fd443c3bc5b3159712dc63fc
   )