projects / ganeti-local / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 723ec67) | patch
Remove mistaken merge conflict line from NEWS
authorGuido Trotter <ultrotter@google.com>
Thu, 11 Apr 2013 21:32:31 +0000 (17:32 -0400)
committerGuido Trotter <ultrotter@google.com>
Thu, 11 Apr 2013 21:32:52 +0000 (17:32 -0400)
commit738a803a756cfb0699b9e96efecd87cdddddf027
treed63c4878668bf110aef2f949ff1c8823f400af23tree | snapshot
parent723ec6789857b06e6e3a2fcecb71a064a6a09627commit | diff
Remove mistaken merge conflict line from NEWS

Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>
NEWS diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.