Skip to content
Commit 125ba8f7 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 15908219 e9270ce9
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment