github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove this conflict marker from a stable merge.

Browse Source
This commit is contained in:
Chris Eppstein 2010-05-15 00:59:26 -07:00
parent 0da025c78d
commit c9b05cbf11
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc-src/content/CHANGELOG.markdown
View File

@ -7,7 +7,6 @@ layout: article
COMPASS CHANGELOG
=================
<<<<<<< HEAD:doc-src/content/CHANGELOG.markdown
0.11.alpha.1
------------