litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing merge error

Browse source
This commit is contained in:
Ralph O'Flinn 2019-06-24 08:43:28 -05:00
parent 92d0fe98c5
commit 27cb119918
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
View file

@ -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