fixed the merge error

This commit is contained in:
mikespook 2012-05-28 10:43:08 +08:00
parent 3e7b5d6cf3
commit 16f134a30a

View File

@ -22,7 +22,7 @@ var (
ErrOutOfCap = errors.New("Out of the capability.")
ErrNotConn = errors.New("Did not connect to job server.")
ErrFuncNotFound = errors.New("The function was not found.")
ErrEmptyReading = errors.New("Empty reading.")
ErrConnection = errors.New("Connection error.")
ErrNoActiveAgent = errors.New("No active agent.")
)
func DisablePanic() {recover()}