commit | 391af97a71464bc61d86c5d93a65ef5d8fdc12bd | [log] [download] |
---|---|---|
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Mar 20 18:31:01 2015 +0000 |
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Mar 20 18:31:01 2015 +0000 |
tree | 7d2db3eb744c5255beb31a1897575dddf50dec8d | |
parent | 4b378c94237abc3c03301fe276d3a171b07fce26 [diff] |
Re-remove file after merge failure (my fault)