diff options
Diffstat (limited to 'doc/news')
| -rw-r--r-- | doc/news/version_5.20140709.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/news/version_5.20140709.mdwn b/doc/news/version_5.20140709.mdwn index 963d7131c..e7609949f 100644 --- a/doc/news/version_5.20140709.mdwn +++ b/doc/news/version_5.20140709.mdwn @@ -8,4 +8,4 @@ git-annex 5.20140709 released with [[!toggle text="these changes"]] * Fix bug in automatic merge conflict resolution, when one side is an annexed symlink, and the other side is a non-annexed symlink. * Really fix bug that caused the assistant to make many unncessary - empty merge commits."""]]
\ No newline at end of file + empty merge commits."""]] |