![]() Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java webapp/web/templates/entity/entityListForTabs.jsp |
||
---|---|---|
.. | ||
entity_inject_head.jsp | ||
entityAdmin.jsp | ||
entityBasic.jsp | ||
entityCitation.jsp | ||
entityKeywordsList.jsp | ||
entityList.jsp | ||
entityListForGalleryTab.jsp | ||
entityListForTabs.jsp | ||
entityMergedPropsList.jsp | ||
entityMergedPropsListUngrouped.jsp | ||
linkShortView.jsp |