[open-ils-commits] r15822 - trunk/Open-ILS/web/js/ui/default/acq/financial (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2010-03-12 00:03:03 -0500 (Fri, 12 Mar 2010)
New Revision: 15822

Modified:
   trunk/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
Log:
missed collision marker

Modified: trunk/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/financial/list_funds.js	2010-03-12 05:03:03 UTC (rev 15821)
+++ trunk/Open-ILS/web/js/ui/default/acq/financial/list_funds.js	2010-03-12 05:03:03 UTC (rev 15822)
@@ -113,8 +113,6 @@
     );
 }
 
-<<<<<<< HEAD:Open-ILS/web/js/ui/default/acq/financial/list_funds.js
-=======
 function performRollover(args) {
     progressDialog.show(true, "Processing...");