1 files changed, 1 insertions, 12 deletions

diff --git a/tests.py b/tests.py
index 6d57e7f..875d053 100644
--- a/tests.py
+++ b/tests.py
@@ -276,17 +276,6 @@ class FactoryCreationTestCase(unittest.TestCase):
         except Factory.AssociatedClassError as e:
             self.assertTrue('autodiscovery' not in str(e))
             
-    def testInheritanceWithConflictingClassesError(self):
-        class TestObjectFactory(Factory):
-            pass
-
-        try:
-            class TestModelFactory(TestObjectFactory):
-                pass
-            self.fail()
-        except Factory.AssociatedClassError as e:
-            self.assertTrue('conflicting' in str(e))
-            
     def testInheritanceFromMoreThanOneFactory(self):
         class TestObjectFactory(StubFactory):
             pass
@@ -302,4 +291,4 @@ class FactoryCreationTestCase(unittest.TestCase):
             self.assertTrue('one Factory' in str(e))
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()