mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

revid/revid.go: actually fixed conflict

This commit is contained in:
saxon 2019-01-16 17:49:22 +10:30
parent 606c1a5885
commit d3c8f31c08
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
revid/revid.go
View File

@ -56,7 +56,6 @@ const (
readTimeout = 10 * time.Millisecond readTimeout = 10 * time.Millisecond
) )
<<<<<<< HEAD
// RTMP connection properties. // RTMP connection properties.
const ( const (
rtmpConnectionMaxTries = 5 rtmpConnectionMaxTries = 5
@ -85,8 +84,6 @@ const (
Detail = "Detail" Detail = "Detail"
) )
=======
>>>>>>> master
type Logger interface { type Logger interface {
SetLevel(int8) SetLevel(int8)
Log(level int8, message string, params ...interface{}) Log(level int8, message string, params ...interface{})