testing

2021-12-28 19:04:01 +01:00 · 2021-12-28 19:04:01 +01:00 · 72726ce145
parent 61fb9afeaf
commit 72726ce145
1 changed files with 0 additions and 5 deletions
--- a/main.go
+++ b/main.go
@ -24,12 +24,7 @@ func init() {
 }

 func main() {
-<<<<<<< HEAD
-	logger.Web.Println("test")
-	logger.Web.Println("hey")
-=======
 	logger.Web.Println("test helloo")
->>>>>>> unstable

 	web.RunServer()
 	go web.Test()