diff options
| author | Ben Elliston <bje@gnu.org> | 2007-12-07 00:34:42 +0000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2007-12-07 00:34:42 +0000 |
| commit | dd9afac8c104e0262db9bdc2c43f9c391aae260f (patch) | |
| tree | c73a31fd152369d0330602b75d36c7cff044a91b | |
| parent | d341192e6c20eb14c61d3abb687578d79954d60e (diff) | |
| download | dejagnu-dd9afac8c104e0262db9bdc2c43f9c391aae260f.zip dejagnu-dd9afac8c104e0262db9bdc2c43f9c391aae260f.tar.gz dejagnu-dd9afac8c104e0262db9bdc2c43f9c391aae260f.tar.bz2 | |
Remove stray CVS conflict markers.
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -282,7 +282,6 @@ * NEWS: Likewise. * doc/dejagnu.texi: Regenerate. ->>>>>>> 1.203 2005-12-24 Ben Elliston <bje@gnu.org> * Makefile.am (doc/dejagnu.texi): Don't use shell redirection, in @@ -449,14 +448,12 @@ * config.guess: Update to most recent version. * config.sub: Likewise. ->>>>>>> 1.169 2005-09-24 Ben Elliston <bje@gnu.org> * packaging/pkg/pkginfo (EMAIL): Update mail address. * lib/rsh.exp: Tidy comments. ->>>>>>> 1.147 2005-07-07 Ben Elliston <bje@gnu.org> * lib/telnet.exp (telnet_transmit): Remove; use standard method. @@ -529,7 +526,6 @@ * config.guess: Update to most recent version. * config.sub: Likewise. ->>>>>>> 1.145 2005-04-28 Mark Kettenis <kettenis@gnu.org> * lib/target.exp (prune_warnings): Add a few more linker |