Closed johntayl closed 9 years ago
Removing merge conflict file and updating .gitignore to ignore .orig files.
Removing merge conflict file and updating .gitignore to ignore .orig files.