From 4614f4be3eafb88da0a105fcb9ad772416c28671 Mon Sep 17 00:00:00 2001
From: Matt Brown <github@muglug.com>
Date: Sat, 17 Oct 2020 12:30:19 -0400
Subject: [PATCH] Unskip now-working tests

---
 tests/TypeReconciliation/ConditionalTest.php        | 2 +-
 tests/TypeReconciliation/RedundantConditionTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/TypeReconciliation/ConditionalTest.php b/tests/TypeReconciliation/ConditionalTest.php
index 317bbe31c..0ac8231cc 100644
--- a/tests/TypeReconciliation/ConditionalTest.php
+++ b/tests/TypeReconciliation/ConditionalTest.php
@@ -1887,7 +1887,7 @@ class ConditionalTest extends \Psalm\Tests\TestCase
                         return new O();
                     }'
             ],
-            'SKIPPED-assertVarRedefinedInIfWithOr' => [
+            'assertVarRedefinedInIfWithOr' => [
                 '<?php
                     class O {}
 
diff --git a/tests/TypeReconciliation/RedundantConditionTest.php b/tests/TypeReconciliation/RedundantConditionTest.php
index 26fddc5dd..169e1d41f 100644
--- a/tests/TypeReconciliation/RedundantConditionTest.php
+++ b/tests/TypeReconciliation/RedundantConditionTest.php
@@ -1222,7 +1222,7 @@ class RedundantConditionTest extends \Psalm\Tests\TestCase
                     }',
                 'error_message' => 'RedundantCondition',
             ],
-            'SKIPPED-noLongerWarnsAboutRedundancyHere' => [
+            'noLongerWarnsAboutRedundancyHere' => [
                 '<?php
                     function a(bool $a, bool $b) : void {
                         if ($a || $b) {