From 7470deb5a19fde25a431daea4b36ca067191f7f3 Mon Sep 17 00:00:00 2001
From: Joel Butcher <joel@joelbutcher.co.uk>
Date: Fri, 29 Jan 2021 20:32:31 +0000
Subject: [PATCH] fix connected accounts conflict

---
 .../views/profile/connected-accounts-form.blade.php        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/stubs/livewire/resources/views/profile/connected-accounts-form.blade.php b/stubs/livewire/resources/views/profile/connected-accounts-form.blade.php
index 4c8a1377..be7974b4 100644
--- a/stubs/livewire/resources/views/profile/connected-accounts-form.blade.php
+++ b/stubs/livewire/resources/views/profile/connected-accounts-form.blade.php
@@ -22,10 +22,15 @@
 
         <div class="mt-5 space-y-6">
             @foreach ($this->providers as $provider)
+<<<<<<< HEAD
                 @php
                     $account = null;
-                    $account = $this->accounts->where('provider', $provider)->first()
+                    $account = $this->accounts->where('provider_name', $provider)->first()
                 @endphp
+=======
+                @if ($account = $this->accounts->where('provider', $provider)->first())
+                    <x-connected-account provider="{{ $account->provider }}" created-at="{{ $account->created_at }}">
+>>>>>>> 2.x
 
                 <x-connected-account provider="{{ $provider }}" created-at="{{ $account->created_at ?? null }}">
                     <x-slot name="action">