diff options
| author | Martin Baulig <martin@src.gnome.org> | 1999-02-28 11:26:02 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1999-02-28 11:26:02 +0000 |
| commit | 3096482697c773068ae6c8924c3e21fa4366e40b (patch) | |
| tree | 802e97fe59aeaa76188d3a42718861fd34c13787 /macros/gnome-objc-checks.m4 | |
| parent | 68726dfdfc5f145221e0e3e77e3db290dd7cfc3a (diff) | |
| download | gnome-common-3096482697c773068ae6c8924c3e21fa4366e40b.tar.gz | |
Remove a CVS conflict marker.
svn path=/trunk/; revision=666
Diffstat (limited to 'macros/gnome-objc-checks.m4')
0 files changed, 0 insertions, 0 deletions