From 921e4e4ac7ed969af4a93dee2972b2c0ebfcccc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 14 Oct 2009 00:00:08 +0200
Subject: [PATCH] ItEr30S15RFVisualizacionMultiplesProxectosItEr29S18: Renaming
 controller variable to avoid collisions

---
 .../src/main/webapp/resourceload/_resourceload.zul            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/resourceload/_resourceload.zul b/navalplanner-webapp/src/main/webapp/resourceload/_resourceload.zul
index 5ac58d874..ca944ec4c 100644
--- a/navalplanner-webapp/src/main/webapp/resourceload/_resourceload.zul
+++ b/navalplanner-webapp/src/main/webapp/resourceload/_resourceload.zul
@@ -23,9 +23,9 @@
 <zk>
 
     <zscript><![CDATA[
-        controller = resourceLoadController;
+        rsController = resourceLoadController;
     ]]>
     </zscript>
-    <div apply="${controller}" self="@{define(content)}">
+    <div apply="${rsController}" self="@{define(content)}">
     </div>
 </zk>
\ No newline at end of file