comparison lisp/battery.el @ 106394:51d4bdf757c8

Correct conflicts in previous patch.
author Alan Mackenzie <acm@muc.de>
date Thu, 03 Dec 2009 15:56:29 +0000
parents a9dc0e7c3f2b
children 1d1d5d9bd884
comparison
equal deleted inserted replaced
106393:fec9af996891 106394:51d4bdf757c8