| commit | 1e5e819d312208452c511853096bccb20b0274cc | [log] [download] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Mar 20 17:43:37 2015 +0000 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Fri Mar 20 17:46:17 2015 +0000 |
| tree | 8a6903ce10b26b63f2a1f03ad1b2a720e45e569b | |
| parent | 7c4e60fa7d54f0356307c014e6aefbfda1dca8c8 [diff] |
Fix forgotten merge conflict