@@ -16,9 +16,6 @@ require (
github.com/robfig/cron v1.2.0
github.com/robfig/cron/v3 v3.0.1
github.com/tealeg/xlsx v1.0.5
-<<<<<<< HEAD
-=======
github.com/zeromicro/go-zero v1.5.2
->>>>>>> master
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
)
WH01243