From c8a73c59084043a3dcd9585d5603df1d998bc344 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Thu, 11 Oct 2012 11:44:07 -0400
Subject: [PATCH] SPRNET-881 fixing merge error

---
 .../Objects/Factory/IListableObjectFactory.cs | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs
index c071a342..c7a832b6 100644
--- a/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/IListableObjectFactory.cs
@@ -335,36 +335,5 @@ namespace Spring.Objects.Factory
 	    /// If the objects could not be created.
 	    /// </exception>
 	    IDictionary<string, T> GetObjects<T>(bool includePrototypes, bool includeFactoryObjects);
-
-        /// <summary>
-        /// Return an instance (possibly shared or independent) of the given object name.
-        /// </summary>
-        /// <remarks>
-        /// <para>
-        /// This method allows an object factory to be used as a replacement for the
-        /// Singleton or Prototype design pattern.
-        /// </para>
-        /// <para>
-        /// Note that callers should retain references to returned objects. There is no
-        /// guarantee that this method will be implemented to be efficient. For example,
-        /// it may be synchronized, or may need to run an RDBMS query.
-        /// </para>
-        /// <para>
-        /// Will ask the parent factory if the object cannot be found in this factory
-        /// instance.
-        /// </para>
-        /// </remarks>
-        /// <typeparam name="T">The type of the object to return.</typeparam>
-        /// <returns>The instance of the object.</returns>
-        /// <exception cref="Spring.Objects.Factory.NoSuchObjectDefinitionException">
-        /// If there's no such object definition.
-        /// </exception>
-        /// <exception cref="Spring.Objects.Factory.ObjectDefinitionStoreException">
-        /// If there is more than a single object of the requested type defined in the factory.
-        /// </exception>
-        /// <exception cref="Spring.Objects.ObjectsException">
-        /// If the object could not be created.
-        /// </exception>
-        T GetObject<T>();
 	}
 }
\ No newline at end of file