From 29fa7a6590b59c135b824cf6f9e60e311c038b5e Mon Sep 17 00:00:00 2001
From: furo <furo@qwik.space>
Date: Sat, 15 Jan 2022 18:54:26 +0100
Subject: [PATCH] whops

---
 README.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e26e146..594dd89 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # qwik-register
+A really cool registration page, I promise <3
 
-<<<<<<< HEAD
 ## GLAuth installation
 
 ```
@@ -61,6 +61,3 @@ INSERT INTO groups(name, gidnumber) VALUES('root', 100);
 
 INSERT INTO includegroups(parentgroupid, includegroupid) VALUES(10, 0);
 ```
-=======
-A really cool registration page, I promise <3 
->>>>>>> 429ce54fd89747f18c33167175c8c0531fee9627