merged

2021-12-28 18:57:28 +01:00 · 2021-12-28 18:57:28 +01:00 · 61fb9afeaf
parent c0cb483c83 3310512404
commit 61fb9afeaf
1 changed files with 4 additions and 0 deletions
--- a/main.go
+++ b/main.go
@ -24,8 +24,12 @@ func init() {
 }

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

 	web.RunServer()
 	go web.Test()