CliffordAnderson/corpus-baudelaire — pull request #19 by Ramona2020 (2014-05-20 21:17:27+00:00)
Title: Resolved Conflict for La Beaute

Don't know why there was a conflict. I looked at the two sections and they were exactly the same. I went with the version labelled upstream/master and that must be the right choice since it says I can automatically merge. Let's hope I don't blow this thing up!

Ramona