Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

Commit

Permalink
CHANGELOG entry
Browse files Browse the repository at this point in the history
  • Loading branch information
@smashwilson
smashwilson committed Apr 25, 2016
1 parent b61a2ce commit ae70931
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.4.1

- Rewrite the Conflict parser as a proper recursive descent parser. [#229](https://github.com/smashwilson/merge-conflicts/pull/229)

## 1.4.0

- Handle three-way merge markers. [#219](https://github.com/smashwilson/merge-conflicts/pull/219)
Expand Down

0 comments on commit ae70931

Please sign in to comment.