From 6cf9eb0de1f6a4bee6655ada346f96d4ae5c21af Mon Sep 17 00:00:00 2001
From: hanemile <mail@emile.space>
Date: Sun, 19 Jul 2020 16:51:20 +0200
Subject: removed merge conflicts

---
 src/db/go.mod | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/db/go.mod')

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
-- 
cgit 1.4.1