Github user mbeckerle commented on the issue:
https://github.com/apache/incubator-daffodil/pull/7
That's because I added a disclaimer file, and so did Steve on latest
master. So this conflict has popped up since his latest push. I'll drop the
file from mine. ---
