From 13c3841e69f9051e8c52299a673bd9b7e41bfea7 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 19 Feb 2009 04:36:56 +0000
Subject: [PATCH] svn path=/trunk/boinc/; revision=17305

---
 html/user/host_edit_action.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/user/host_edit_action.php b/html/user/host_edit_action.php
index e7294a6393..7ea2f2886c 100644
--- a/html/user/host_edit_action.php
+++ b/html/user/host_edit_action.php
@@ -49,7 +49,8 @@ for ($i=1; $i<$nhosts; $i++) {
 	if ($host->create_time > $latest_host->create_time) {
 		$error = merge_hosts($latest_host, $host);
         if ($error) {
-            fail($error);
+            echo "<br>$error\n";
+            continue;
         }
 		$latest_host = $host;
 	} else {