CenterForOpenScience/osc — pull request #41 by shaunagm (2013-11-23 18:25:30+00:00)
Title: Gets rid of merge conflict syntax in policy.md

In a previous commit I accidentally introduced some merge conflict syntax into policy.md - this gets rid of those changes (https://github.com/CenterForOpenScience/osc/issues/40).