Revert "Auto stash before merge of "master" and "origin/master""

This reverts commit ff8fd92a.

coolq/cqcode.go

@@ -465,11 +465,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (message.
 				return nil, errors.New("song error")
 			}
 			json :=  fmt.Sprintf("{\"app\": \"com.tencent.structmsg\",\"desc\": \"音乐\",\"meta\": {\"music\": {\"desc\": \"来自MiraiGo\",\"jumpUrl\": \"%s\",\"musicUrl\": \"%s\",\"preview\": \"%s\",\"tag\": \"QQ音乐\",\"title\": \"%s\"}},\"prompt\": \"[分享]%s\",\"ver\": \"0.0.0.1\",\"view\": \"music\"}", jumpUrl, purl, preview, name, name)
-<<<<<<< Updated upstream
 			return message.NewJsonMsg(json), nil
-=======
-			return message.NewLightApp(json), nil
->>>>>>> Stashed changes
 		}
 		if d["type"] == "163" {
 			info, err := global.NeteaseMusicSongInfo(d["id"])

go.mod

@@ -3,11 +3,7 @@ module github.com/Mrs4s/go-cqhttp
 go 1.14
 
 require (
-<<<<<<< Updated upstream
 	github.com/Mrs4s/MiraiGo v0.0.0-20200901081949-6328ae0e93db
-=======
-	github.com/Mrs4s/MiraiGo v0.0.0-20200902072401-56d3e65e98b5
->>>>>>> Stashed changes
 	github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 // indirect
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-playground/validator/v10 v10.3.0 // indirect