fix merge conflict with PR ome#1006

mtbc · Apr 10, 2013 · 02e1607 · 02e1607
1 parent 3f00a79
commit 02e1607
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/blitz/src/ome/services/blitz/repo/ManagedRepositoryI.java b/components/blitz/src/ome/services/blitz/repo/ManagedRepositoryI.java
@@ -84,9 +84,9 @@
 public class ManagedRepositoryI extends PublicRepositoryI
     implements _ManagedRepositoryOperations {
 
-    private static final Log log = LogFactory.getLog(ManagedRepositoryI.class);
+    private final static Log log = LogFactory.getLog(ManagedRepositoryI.class);
 
-    private static final int parentDirsToRetain = 3;
+    private final static int parentDirsToRetain = 3;
 
     /* This class is used in the server-side creation of import containers.
      * The suggestImportPaths method sanitizes the paths in due course.