Merge branch '0.2.x' into 0.3.x

2013-06-25 00:15:33 +00:00
parent 0a47d4c1fa f7ad5a4b97
commit e7d36757ef
1 changed files with 1 additions and 1 deletions
--- a/blkmaker_jansson.c
+++ b/blkmaker_jansson.c
@@ -175,7 +175,7 @@ void my_flip(void *data, size_t datasz) {

 const char *blktmpl_add_jansson(blktemplate_t *tmpl, const json_t *json, time_t time_rcvd) {
 	if (tmpl->version)
-		return false;
+		return "Template already populated (combining not supported)";
 	
 	json_t *v, *v2;
 	const char *s;