Compare commits
2 Commits
c0cb483c83
...
61fb9afeaf
Author | SHA1 | Date |
---|---|---|
|
61fb9afeaf | |
|
3310512404 |
4
main.go
4
main.go
|
@ -24,8 +24,12 @@ func init() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
<<<<<<< HEAD
|
||||||
logger.Web.Println("test")
|
logger.Web.Println("test")
|
||||||
logger.Web.Println("hey")
|
logger.Web.Println("hey")
|
||||||
|
=======
|
||||||
|
logger.Web.Println("test helloo")
|
||||||
|
>>>>>>> unstable
|
||||||
|
|
||||||
web.RunServer()
|
web.RunServer()
|
||||||
go web.Test()
|
go web.Test()
|
||||||
|
|
Loading…
Reference in New Issue