whops

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