diff --git a/resources/views/themes/default1/client/layout/logclient.blade.php b/resources/views/themes/default1/client/layout/logclient.blade.php index 01306b0bc..9a0e1d7fa 100644 --- a/resources/views/themes/default1/client/layout/logclient.blade.php +++ b/resources/views/themes/default1/client/layout/logclient.blade.php @@ -208,6 +208,7 @@ +<<<<<<< HEAD @endif @@ -219,9 +220,9 @@