Fixed up some merge issues.

2013-02-21 06:14:01 +06:00
parent f8760b34b8
commit e084ddeb41
2 changed files with 1 additions and 3 deletions
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -138,8 +138,7 @@ namespace Umbraco.Tests.TestHelpers

                //We will swallow this exception! That's because a sub class might require further teardown logic.
            }
-                
-            }    
+                            
        }

 	    protected ApplicationContext ApplicationContext