From a75defb6000288f4351f83a9f99589adccbc48f5 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Mon, 5 Nov 2007 15:22:59 +0000
Subject: [PATCH] Resolved merge conflict resolution

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7295 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/web/scripts/FormData.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/java/org/alfresco/web/scripts/FormData.java b/source/java/org/alfresco/web/scripts/FormData.java
index 3ef42940ab..07609447ac 100644
--- a/source/java/org/alfresco/web/scripts/FormData.java
+++ b/source/java/org/alfresco/web/scripts/FormData.java
@@ -62,7 +62,6 @@ public class FormData implements Serializable, Scopeable
     private Map<String, FormField> fields = null;
     private Map<String, String> parameters = null;
     private Map<String, ScriptContent> files = null;
-    private List<FileItem> files = null;
     private String encoding = null;
    
     /**