Browse Source

Removed merge statements from info.

pull/476/head
MorganDawe 11 years ago
parent
commit
794a61d6d2
  1. 3
      islandora.info

3
islandora.info

@ -22,9 +22,6 @@ files[] = tests/islandora_manage_permissions.test
files[] = tests/datastream_versions.test files[] = tests/datastream_versions.test
files[] = tests/datastream_cache.test files[] = tests/datastream_cache.test
files[] = tests/derivatives.test files[] = tests/derivatives.test
<<<<<<< HEAD
files[] = tests/islandora_manage_temp_file.test files[] = tests/islandora_manage_temp_file.test
=======
files[] = tests/datastream_validator_tests.test files[] = tests/datastream_validator_tests.test
>>>>>>> 6c3fcb0381318857b6c2aa7f9059f939ab7ecef5
php = 5.3 php = 5.3

Loading…
Cancel
Save