diff options
| author | Paul Varner <fuzzyray@gentoo.org> | 2011-01-06 15:29:22 -0600 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2011-01-06 15:29:22 -0600 |
| commit | 011173cb22d6df31985c4239970b03bde00d1fcb (patch) | |
| tree | 9258637ea1bf38d558a0ebbba7e2f114c19920b6 /data | |
| parent | 8dd84876ff2ec924390ac98284273e154f5fb339 (diff) | |
| download | gentoolkit-011173cb22d6df31985c4239970b03bde00d1fcb.tar.gz | |
Remove extraneous merge conflict marker.
Diffstat (limited to 'data')
0 files changed, 0 insertions, 0 deletions