fix conflicts

laravel · Dec 20, 2016 · cf42140 · cf42140
2 parents be23bc5 + 69666e6
commit cf42140
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Illuminate/Notifications/composer.json b/src/Illuminate/Notifications/composer.json
@@ -20,6 +20,7 @@
         "illuminate/container": "5.4.*",
         "illuminate/contracts": "5.4.*",
         "illuminate/mail": "5.4.*",
+        "illuminate/queue": "5.4.*",
         "illuminate/support": "5.4.*",
         "ramsey/uuid": "~3.0"
     },

diff --git a/tests/Config/RepositoryTest.php b/tests/Config/RepositoryTest.php
@@ -43,7 +43,7 @@ public function testHasIsTrue()
         $this->assertTrue($this->repository->has('foo'));
     }
 
-    public function testHasIsTFalse()
+    public function testHasIsFalse()
     {
         $this->assertFalse($this->repository->has('not-exist'));
     }