From 16f134a30a7533b5b47d3e91666eec4c9b5c0ef4 Mon Sep 17 00:00:00 2001
From: mikespook <none@none>
Date: Mon, 28 May 2012 10:43:08 +0800
Subject: [PATCH] fixed the merge error

---
 common/error.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/error.go b/common/error.go
index ede37f7..ccb337a 100644
--- a/common/error.go
+++ b/common/error.go
@@ -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()}