Removed merge conflict header
Merge pull request #3255 from jlund/sha256-example-cleanup

Removed merge conflict header