Remove conflict marker, move entry to its chronological location.
authorRomain Francoise <romain@orebokech.com>
Sun, 14 Aug 2005 08:49:58 +0000 (08:49 +0000)
committerRomain Francoise <romain@orebokech.com>
Sun, 14 Aug 2005 08:49:58 +0000 (08:49 +0000)
commitf68264bf3f7a184a8e5a815db21ed6f29a3e2e80
treeda1481ed13b69982de6509c601e1e194a7dfea10
parentce197704f9d31b5deb1d87721b163c84e6be57ac
Remove conflict marker, move entry to its chronological location.
lisp/ChangeLog