pculture/mirocommunity — comment on commit c264c74d294fa6801133dd17422de89df7eefaef
File:  line 0
By paulswartz:

The diff I meant was the merge commit, but it looks okay because it doesn't appear you made any changes to those files.