ignore .orig conflict resoleution files
ignore .orig conflict resoleution files

jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry,jonphipps/Metadata-Registry