diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-15 16:18:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-15 16:18:07 +0000 |
| commit | 255775e46af9da10c0ab117282c272dc80f6f954 (patch) | |
| tree | 438bf5b87e7c06b5f0ffdecd6f6c1ecfd774167c /advertising/NEWS | |
| parent | 1746f110d87be8ced7318dcc4270e228399b1284 (diff) | |
| download | drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar.gz drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar.bz2 drakx-255775e46af9da10c0ab117282c272dc80f6f954.tar.xz drakx-255775e46af9da10c0ab117282c272dc80f6f954.zip | |
fix mismerge
Diffstat (limited to 'advertising/NEWS')
0 files changed, 0 insertions, 0 deletions