removed diff leftover from merge conflict
Merge pull request #6 from thompsona/removeDiff

Removed diff leftover from merge conflict