From 27cb119918cee908942e81127691f17a7d623f49 Mon Sep 17 00:00:00 2001 From: Ralph O'Flinn Date: Mon, 24 Jun 2019 08:43:28 -0500 Subject: [PATCH] fixing merge error --- .../src/main/webapp/WEB-INF/resources/startup_listeners.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt index 6d3b1821..a3727d05 100644 --- a/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt +++ b/webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt @@ -89,7 +89,7 @@ edu.cornell.mannlib.vivo.orcid.OrcidContextSetup # Register the extensions to the IndividualResponseBuilder (e.g. alt metric, plum analytics) edu.cornell.mannlib.vitro.webapp.controller.individual.VIVOIndividualResponseBuilderExtension$Setup -# This should be near the end, because it will issue a warning if the connection to Solr times out. -edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest +# This should be near the end, because it will issue a warning if the connection to the SearchEngine times out. +edu.cornell.mannlib.vitro.webapp.servlet.setup.SearchEngineSmokeTest org.vivoweb.webapp.startup.i18nSetup