testing
parent
61fb9afeaf
commit
72726ce145
5
main.go
5
main.go
|
@ -24,12 +24,7 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
<<<<<<< HEAD
|
|
||||||
logger.Web.Println("test")
|
|
||||||
logger.Web.Println("hey")
|
|
||||||
=======
|
|
||||||
logger.Web.Println("test helloo")
|
logger.Web.Println("test helloo")
|
||||||
>>>>>>> unstable
|
|
||||||
|
|
||||||
web.RunServer()
|
web.RunServer()
|
||||||
go web.Test()
|
go web.Test()
|
||||||
|
|
Loading…
Reference in New Issue