瀏覽代碼

db依赖变更

visuddhinanda 5 年之前
父節點
當前提交
57b170ecaf
共有 1 個文件被更改,包括 0 次插入4 次删除
  1. 0 4
      api/go.mod

+ 0 - 4
api/go.mod

@@ -3,13 +3,9 @@ module github.com/iapt-platform
 go 1.16
 
 require (
-<<<<<<< HEAD
-	github.com/gin-gonic/gin v1.7.2
-=======
 	github.com/gin-gonic/gin v1.7.2 // indirect
 	github.com/go-pg/pg/v10 v10.10.1 // indirect
 	github.com/go-playground/validator v9.31.0+incompatible // indirect
->>>>>>> 13ce3b4c5e6731da7f7f029bdbf1dd230490df19
 	github.com/go-playground/validator/v10 v10.6.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/jackc/pgproto3/v2 v2.1.0 // indirect