From 18c366c6d064147a118ab8397a1c2cbc3b0ec4d0 Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Mon, 28 Mar 2016 12:10:33 -0400
Subject: [PATCH] Remove now unused variable and documentation.

---
 test/tool_shed/functional_tests.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/tool_shed/functional_tests.py b/test/tool_shed/functional_tests.py
index 050e11bd8fd..115ea6c5222 100644
--- a/test/tool_shed/functional_tests.py
+++ b/test/tool_shed/functional_tests.py
@@ -31,11 +31,6 @@ from functional import database_contexts
 default_tool_shed_test_host = "localhost"
 default_galaxy_test_host = 'localhost'
 
-# Use separate databases for Galaxy and tool shed install info by default,
-# set GALAXY_TEST_INSTALL_DB_MERGED to True to revert to merged databases
-# behavior.
-default_install_db_merged = False
-
 
 tool_sheds_conf_xml_template = '''<?xml version="1.0"?>
 <tool_sheds>