diff options
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/go.mod b/go.mod index 42edc46..2ef4b51 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,11 @@ go 1.13 require ( git.darknebu.la/chaosdorf/freitagsfoo/src/db v0.0.0-00010101000000-000000000000 +<<<<<<< HEAD git.darknebu.la/chaosdorf/freitagsfoo/src/structs v0.0.0-20200718235609-fc63adf55849 +======= + git.darknebu.la/chaosdorf/freitagsfoo/src/structs v0.0.0-00010101000000-000000000000 +>>>>>>> refs/remotes/origin/master github.com/go-pg/pg/v9 v9.1.6 github.com/google/uuid v1.1.1 github.com/gorilla/mux v1.7.4 |
