Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix more merge fail

  • Loading branch information...
commit 016e025affca7f431a93c73ad9dd23ed18159432 1 parent 5426727
@hone hone authored
Showing with 0 additions and 1 deletion.
  1. +0 −1  CHANGELOG.md
View
1  CHANGELOG.md
@@ -79,7 +79,6 @@ Bugfixes:
- Improve Rake 0.9 support (@quix)
- Handle certain directories already existing (@raggi)
- Escape filenames containing regex characters (@indirect)
->>>>>>> 1-0-stable
## 1.0.13 (May 4, 2011)
Please sign in to comment.
Something went wrong with that request. Please try again.