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

Merge branch 'develop' into feature/fauxEditing

Browse source 
Conflicts:
	webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java
	webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java
	webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java
This commit is contained in:
Jim Blake 2014-11-09 16:11:45 -05:00
commit 2fa9583569
16 changed files with 294 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webapp/test/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoaderTest.java
View file

@ -101,7 +101,7 @@ public class ConfigurationBeanLoaderTest extends AbstractTestClass {
expectException(NullPointerException.class, "model may not be null");
@SuppressWarnings("unused")
Object unused = new ConfigurationBeanLoader(null);
Object unused = new ConfigurationBeanLoader((Model) null);
}
// ----------------------------------------------------------------------