diff options
| author | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-03-02 20:51:40 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-03-02 20:51:40 +0000 |
| commit | 32e21f2be67d7aae6bd83351d16c0a5500c4830d (patch) | |
| tree | d27f0f4706d838eefb74642ff3d08e04d94b1b61 /tests/merge-1.ui | |
| parent | cddfd994ef4ed9a92444c409dd37d9357acbfacb (diff) | |
| download | gtk+-32e21f2be67d7aae6bd83351d16c0a5500c4830d.tar.gz | |
Remove conflict markers
Diffstat (limited to 'tests/merge-1.ui')
0 files changed, 0 insertions, 0 deletions