diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-07-10 15:08:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-10 15:08:30 -0400 |
| commit | 70e8fdadb3c29e23f66efab1ffda436fb7f03828 (patch) | |
| tree | bb62c045be9aa2abc15332d418e0bbd0b5112b04 /doc/bugs/files_lost_during_upgrade.mdwn | |
| parent | c296effb7527fe288f897d533edc0ae221d87ba2 (diff) | |
close
Diffstat (limited to 'doc/bugs/files_lost_during_upgrade.mdwn')
| -rw-r--r-- | doc/bugs/files_lost_during_upgrade.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/bugs/files_lost_during_upgrade.mdwn b/doc/bugs/files_lost_during_upgrade.mdwn index 7c38af7c4..afab38d81 100644 --- a/doc/bugs/files_lost_during_upgrade.mdwn +++ b/doc/bugs/files_lost_during_upgrade.mdwn @@ -2186,3 +2186,6 @@ channel 4: bad ext data # End of transcript or log. """]] + +> [[fixed|done]]; the merge race has been fixed. The upgrade loop has also +> been dealt with. --[[Joey]] |