Remove merge markers

mrhaki · Jul 9, 2018 · 11d0891 · 11d0891
1 parent 1cf1bd3
commit 11d0891
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.teamcityTest/Gradle_Check_Tests/CIConfigIntegrationTests.kt b/.teamcityTest/Gradle_Check_Tests/CIConfigIntegrationTests.kt
@@ -74,19 +74,11 @@ class CIConfigIntegrationTests {
                     }
                 }
 
-<<<<<<< Updated upstream
-                assertEquals(
-                        stage.specificBuilds.size + functionalTestCount
-                                + stage.performanceTests.size + (if (prevStage != null) 1 else 0)
-                                + (if (!stage.omitsSlowProjects && prevStage != null && prevStage.omitsSlowProjects) 4 else 0), // deferred tests
-                        it.dependencies.items.size, "Unexpected number of dependencies in stage ${stage.name} ${stage.omitsSlowProjects} " )
-=======
                 // hacky way to consider deferred tests
                 var deferredTestCount = if (stage.name.contains("Master Accept")) 10 else 0
                 assertEquals(
                stage.specificBuilds.size + functionalTestCount + stage.performanceTests.size + (if (prevStage != null) 1 else 0) + deferredTestCount,
                        it.dependencies.items.size, "${stage.name}")
->>>>>>> Stashed changes
             } else {
                 assertEquals(2, it.dependencies.items.size) //Individual Performance Worker
             }