Skip to content

Commit

Permalink
1.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
eush77 committed Feb 7, 2016
1 parent 3154bee commit 124d898
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "git-conflicts",
"version": "1.3.4",
"version": "1.3.5",
"description": "Manual merge tool",
"author": "Eugene Sharygin <eush77@gmail.com>",
"license": "MIT",
Expand Down

0 comments on commit 124d898

Please sign in to comment.