diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-02-15 21:44:11 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-02-15 21:44:11 +0000 |
| commit | 08bbc0210c243cb1c7e41d0c434fc069c7b2743c (patch) | |
| tree | caf61ae24e2ab7fd66309bc68d44bd654b18a022 | |
| parent | b1aa8a0baf783a251be6e8021a7881e63b8f9830 (diff) | |
* remove line from ChangeLog which was an artifact of an update conflict
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -27,7 +27,6 @@ but it's now possible to store these in arrays, emit them in signals, etc. ->>>>>>> 1.959 2006-02-10 John (J5) Palmieri <johnp@redhat.com> * dbus/dbus-signature.c (dbus_signature_iter_recurse): Correctly |