From cb7f6f8a5f509b458dd3d1f1b796c0f14a4f2d62 Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Fri, 2 Mar 2012 17:26:28 +0000
Subject: [PATCH] Fixed up merge issues + Eclipse classpath

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/content/ContentServiceImpl.java  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/source/java/org/alfresco/repo/content/ContentServiceImpl.java b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
index c36dd94300..85df8651ac 100644
--- a/source/java/org/alfresco/repo/content/ContentServiceImpl.java
+++ b/source/java/org/alfresco/repo/content/ContentServiceImpl.java
@@ -91,7 +91,6 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
     private RetryingTransactionHelper transactionHelper;
     private ApplicationContext applicationContext;
     protected TransformerDebug transformerDebug;
-    private MimetypeService mimetypeService;
 
 
     /** a registry of all available content transformers */
@@ -190,15 +189,6 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
         this.transformerDebug = transformerDebug;
     }
 
-    /**
-     * Helper setter of the mimetypeService. 
-     * @param mimetypeService
-     */
-    public void setMimetypeService(MimetypeService mimetypeService)
-    {
-        this.mimetypeService = mimetypeService;
-    }
-
     /**
      * Service initialise 
      */