| commit | 7d6453ac9cf7cb893cafa4017988da73b5a01ac2 | [log] [download] |
|---|---|---|
| author | okuji <okuji@localhost> | Sun Jun 18 13:59:32 2000 +0000 |
| committer | okuji <okuji@localhost> | Sun Jun 18 13:59:32 2000 +0000 |
| tree | a8f5bd304f714d420b124dbb4ccec30cf55ff916 | |
| parent | c67be0dccd65d33087edecac8b01d0741c8b8920 [diff] |
I forgot to remove a conflict indicator.