about summary refs log tree commit diff
path: root/src/db/go.mod
diff options
context:
space:
mode:
authorhanemile <mail@emile.space>2020-07-19 16:46:51 +0200
committerhanemile <mail@emile.space>2020-07-19 16:46:51 +0200
commit5f4a132f1656d8aa388e1ca3151c1bcc222c0cb6 (patch)
treeb7e722dbdfdc8bb0e8caa74563086163fd133401 /src/db/go.mod
parent508097bd45862195ab45e2179806af78084b83b1 (diff)
parent766683ed07acf3339b750b24f85136c6aab8c717 (diff)
foo
Diffstat (limited to 'src/db/go.mod')
-rw-r--r--src/db/go.mod3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/db/go.mod b/src/db/go.mod
index 64c66b8..2c20fbf 100644
--- a/src/db/go.mod
+++ b/src/db/go.mod
@@ -3,7 +3,10 @@ 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