Commit 24d551ff authored by CADC Software Admin--S.Gaudet's avatar CADC Software Admin--S.Gaudet
Browse files

Fixed a merge conflict. 

Merge branch 'release_candidate' into installed

Conflicts:
	projects/cadcRegistry/src/resources/RegistryClient.properties
parents b16e3dfa efdb5990

There are no changes