diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2002-02-06 16:24:25 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2002-02-06 16:24:25 +0000 |
| commit | 262d4e892d2c8fd993f04b404fe06c2897e3c5ca (patch) | |
| tree | 55af749b63c8fd7492c9495f786f6914859138a5 /etc/SERVICE | |
| parent | 108eaabb6b8fd0deb527e0b53b3d0cbf731e280a (diff) | |
| download | emacs-262d4e892d2c8fd993f04b404fe06c2897e3c5ca.tar.gz | |
Remove traces of merge conflicts.
Diffstat (limited to 'etc/SERVICE')
0 files changed, 0 insertions, 0 deletions