fix conflicts

taylorotwell · taylorotwell · commit 57dc671ead54 · 2025-02-18T14:13:57.000-06:00
diff --git a/tests/Feature/DashboardTest.php b/tests/Feature/DashboardTest.php
@@ -19,6 +19,6 @@ public function test_authenticated_users_can_visit_the_dashboard()
     {
         $this->actingAs($user = User::factory()->create());
 
-        $this->get('/dashboard')->assertStatus(200);
+        $this->get('/dashboard')->assertOk();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,6 @@ public function test_authenticated_users_can_visit_the_dashboard()`
`19`	`19`	`{`
`20`	`20`	`$this->actingAs($user = User::factory()->create());`
`21`	`21`
`22`		`- $this->get('/dashboard')->assertStatus(200);`
	`22`	`+ $this->get('/dashboard')->assertOk();`
`23`	`23`	`}`
`24`	`24`	`}`