Removed all the conflicts from the apcups-plugin again.
authorocto <octo>
Wed, 24 May 2006 06:14:28 +0000 (06:14 +0000)
committerocto <octo>
Wed, 24 May 2006 06:14:28 +0000 (06:14 +0000)
commit29713f41f326a923dce84c2e1f8d581a893478b9
treee58114dbe4bcbb3e9089e8ce57a0f9ac1c18f23c
parentdb336a80e7f9e46170e637cc140756d35a90da66
Removed all the conflicts from the apcups-plugin again.
src/apcups.c