about summary refs log tree commit diff
path: root/src/db/go.mod
diff options
context:
space:
mode:
Diffstat (limited to 'src/db/go.mod')
-rw-r--r--src/db/go.mod3
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