Dan McGee f8f4c2a6f3 File conflict code cleanups ... While researching the root cause of FS#24904, I couldn't help but clean up some of the cruft in here. A few whitespace/line-wrapping issues, but also fix shadowed variables and add some const where applicable. Signed-off-by: Dan McGee <dan@archlinux.org>		2011-06-27 09:15:28 -05:00
..
libalpm	File conflict code cleanups	2011-06-27 09:15:28 -05:00