diff options
| author | Hans Insulander <hin@cvs.openbsd.org> | 2000-10-19 18:21:28 +0000 |
|---|---|---|
| committer | Hans Insulander <hin@cvs.openbsd.org> | 2000-10-19 18:21:28 +0000 |
| commit | 7bc6c49b127c0806618143892051b391c0efc873 (patch) | |
| tree | a2cc7dbf0cb1b4f9d90929f64c38d012ac1b5e2a /bin | |
| parent | 89b9f42f7f56a97c16834c65a768c7817bc36114 (diff) | |
Remove merge conflict marker accidentaly left in this file.
Diffstat (limited to 'bin')
0 files changed, 0 insertions, 0 deletions