Remove old merge conflict comments
authorJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 2 Nov 2015 15:10:04 +0000 (15:10 +0000)
committerJKingsnorth <john@johnkingsnorth.co.uk>
Mon, 2 Nov 2015 15:10:04 +0000 (15:10 +0000)
commit38a454f63465b5f35a4eb3f3b779b29eb865520b
tree747176e0aa9933b552054ed37dd22cfdac337e7e
parentca22a75932effb4be3380606dc2d061fdca86133
Remove old merge conflict comments
CRM/Report/Form/Contribute/Summary.php