From 06f7347d89e8a775e435a8bb509fc4ba9a1d17bb Mon Sep 17 00:00:00 2001
From: Arthur Britto <ahbritto@gmail.com>
Date: Thu, 25 Oct 2012 18:19:42 -0700
Subject: [PATCH] UT: Fix build_teardown merge error.

---
 src/RPCHandler.cpp | 1 +
 test/testutils.js  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/RPCHandler.cpp b/src/RPCHandler.cpp
index e94df74f95..f4ac88f2a6 100644
--- a/src/RPCHandler.cpp
+++ b/src/RPCHandler.cpp
@@ -2711,3 +2711,4 @@ Json::Value RPCHandler::doUnlLoad(const Json::Value& params)
 	return "loading";
 }
 
+// vim:ts=4
diff --git a/test/testutils.js b/test/testutils.js
index 60462790ab..d573111c8a 100644
--- a/test/testutils.js
+++ b/test/testutils.js
@@ -167,7 +167,7 @@ exports.build_setup	    = build_setup;
 exports.create_accounts	    = create_accounts;
 exports.credit_limit	    = credit_limit;
 exports.payment		    = payment;
-exports.test_teardown	    = test_teardown;
+exports.build_teardown	    = build_teardown;
 exports.verify_balance	    = verify_balance;
 
 // vim:sw=2:sts=2:ts=8