diff options
| author | hanemile <mail@emile.space> | 2020-07-19 16:51:20 +0200 |
|---|---|---|
| committer | hanemile <mail@emile.space> | 2020-07-19 16:51:20 +0200 |
| commit | 6cf9eb0de1f6a4bee6655ada346f96d4ae5c21af (patch) | |
| tree | 22cd361727f2d14f5fc4ac4925397947ccb77af3 /src/db/go.mod | |
| parent | ba9b3dfae3166406fa759b1c52909c12b47d09fc (diff) | |
removed merge conflicts
Diffstat (limited to 'src/db/go.mod')
| -rw-r--r-- | src/db/go.mod | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/db/go.mod b/src/db/go.mod index 2c20fbf..64c66b8 100644 --- a/src/db/go.mod +++ b/src/db/go.mod @@ -3,10 +3,7 @@ module git.darknebu.la/chaosdorf/freitagsfoo/src/db go 1.13 require ( -<<<<<<< HEAD git.darknebu.la/chaosdorf/freitagsfoo/src/structs v0.0.0-20200718235609-fc63adf55849 -======= ->>>>>>> refs/remotes/origin/master github.com/go-pg/pg/v9 v9.1.6 github.com/google/uuid v1.1.1 github.com/sirupsen/logrus v1.6.0 |
