missed collision marker

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15822 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
index c57b062..7a31f2d 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
+++ b/Open-ILS/web/js/ui/default/acq/financial/list_funds.js
@@ -113,8 +113,6 @@ function loadYearSelector() {
     );
 }
 
-<<<<<<< HEAD:Open-ILS/web/js/ui/default/acq/financial/list_funds.js
-=======
 function performRollover(args) {
     progressDialog.show(true, "Processing...");