fixed merge error (#20)

TNG · Jun 1, 2014 · f529583 · f529583
1 parent b9afc31
commit f529583
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/com/tngtech/java/junit/dataprovider/DataProviderRunner.java b/src/main/java/com/tngtech/java/junit/dataprovider/DataProviderRunner.java
@@ -161,6 +161,8 @@ List<FrameworkMethod> generateExplodedTestMethodsFor(List<FrameworkMethod> testM
                 } else {
                     result.addAll(explodeTestMethod(testMethod, dataProvider));
                 }
+            } else {
+                result.addAll(explodeTestMethod(testMethod, dataProviderMethod));
             }
         }
         return result;