replace line lost during conflict resolution
authorerickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 16 Jul 2010 14:18:12 +0000 (14:18 +0000)
committererickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Fri, 16 Jul 2010 14:18:12 +0000 (14:18 +0000)
commit348097a2b5022bab95263ad2e3a4539186bf10b0
treece8659f1ee8b0314d7bb9fa058c1f37f09dcf3d8
parentac6f1d7d72ecc3dba2fc16533a54157a76b202a7
replace line lost during conflict resolution

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@16959 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm