diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-09 16:16:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-09 16:16:32 -0400 |
| commit | 516ffc19bbb2a6123d21092edaa4af79545c53f7 (patch) | |
| tree | f8d687776c403f27d2dbd6a9b5ce34564c8e087a /doc/news | |
| parent | a5fe7e571fdc65e96a309323d8950565f3cacb81 (diff) | |
update
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."""]] |