# HG changeset patch # User Glenn Morris # Date 1292261161 28800 # Node ID 93bf3f082e910ef888813863d4e0d229c6a926aa # Parent cbde616eefa5f232ae98606ed16ee42e050998fe ChangeLog merge fix. diff -r cbde616eefa5 -r 93bf3f082e91 etc/ChangeLog --- a/etc/ChangeLog Mon Dec 13 09:24:04 2010 -0800 +++ b/etc/ChangeLog Mon Dec 13 09:26:01 2010 -0800 @@ -2,7 +2,6 @@ * schema/schemas.xml: Add DocBook (Bug#7491). -2010-12-13 Ulrich Mueller 2010-12-11 Carsten Dominik * refcards/orgcard.tex: Cleanup.