| commit | aa5f4ad8ef03d28615e0460788e0c4e3a8373122 | |
| author | Andreas Jaeger <aj@suse.de> | |
| Sun, 7 May 2000 14:13:21 +0000 (7 14:13 +0000) | ||
| committer | Andreas Jaeger <aj@suse.de> | |
| Sun, 7 May 2000 14:13:21 +0000 (7 14:13 +0000) | ||
| tree | 795e7d16830204606e7d35ca6c3184841eae70b2 | treesnapshot (tar.gz zip) |
| parent | f0a7f7424fc45166508ee6bcbe76e7fef77986c4 | commitdiff |
Removed conflict marker.
| ChangeLog | diffblobblamehistory |