fix go.sum

Author: lunny

vendor/modules.txt

@@ -110,11 +110,7 @@ github.com/couchbase/vellum/utf8
 github.com/couchbaselabs/go-couchbase
 # github.com/davecgh/go-spew v1.1.1
 github.com/davecgh/go-spew/spew
-<<<<<<< HEAD
 # github.com/denisenkom/go-mssqldb v0.0.0-20190924004331-208c0a498538
-=======
-# github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952 => github.com/denisenkom/go-mssqldb v0.0.0-20180315180555-6a30f4e59a44
->>>>>>> fix vendor
 github.com/denisenkom/go-mssqldb
 github.com/denisenkom/go-mssqldb/internal/cp
 github.com/denisenkom/go-mssqldb/internal/decimal
@@ -204,21 +200,13 @@ github.com/gobwas/glob/util/runes
 github.com/gobwas/glob/util/strings
 # github.com/gogits/chardet v0.0.0-20150115103509-2404f7772561
 github.com/gogits/chardet
-<<<<<<< HEAD
 # github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
 github.com/gogs/cron
 # github.com/gogs/go-gogs-client v0.0.0-20190710002546-4c3c18947c15
 github.com/gogs/go-gogs-client
 # github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe
 github.com/golang-sql/civil
 # github.com/golang/protobuf v1.3.2
-=======
-# github.com/gogits/cron v0.0.0-20160810035002-7f3990acf183
-github.com/gogits/cron
-# github.com/gogs/go-gogs-client v0.0.0-20181217004319-1cd0db3113de
-github.com/gogs/go-gogs-client
-# github.com/golang/protobuf v1.3.1
->>>>>>> fix vendor
 github.com/golang/protobuf/proto
 # github.com/golang/snappy v0.0.1
 github.com/golang/snappy