From c9b05cbf11210d469e6babb687a968bb42b0eb4a Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sat, 15 May 2010 00:59:26 -0700 Subject: [PATCH] Remove this conflict marker from a stable merge. --- doc-src/content/CHANGELOG.markdown | 1 - 1 file changed, 1 deletion(-) diff --git a/doc-src/content/CHANGELOG.markdown b/doc-src/content/CHANGELOG.markdown index fcf9414a..7afa47cf 100644 --- a/doc-src/content/CHANGELOG.markdown +++ b/doc-src/content/CHANGELOG.markdown @@ -7,7 +7,6 @@ layout: article COMPASS CHANGELOG ================= -<<<<<<< HEAD:doc-src/content/CHANGELOG.markdown 0.11.alpha.1 ------------