Updated line endings.
Missed two files in merge conflict resolution
Updated line endig conflicts in resourceAppView.js