From 85d94063bdb5384cb288bb13b19e28576f17ffea Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 12 Mar 2010 05:03:03 +0000
Subject: [PATCH] missed collision marker
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15822 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/web/js/ui/default/acq/financial/list_funds.js | 2 --
1 file changed, 2 deletions(-)
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 c57b062963..7a31f2d204 100644
--- 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...");
--
2.11.0