From 5d3380ef82e7b3eba08863c0f0cfdd4af6827a61 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 17 Jun 2025 14:30:34 +0300
Subject: [PATCH] fixed merge conflict.

---
 lib/pages/home/bloc/home_bloc.dart | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/pages/home/bloc/home_bloc.dart b/lib/pages/home/bloc/home_bloc.dart
index 7645b03c..c1bcba6a 100644
--- a/lib/pages/home/bloc/home_bloc.dart
+++ b/lib/pages/home/bloc/home_bloc.dart
@@ -19,11 +19,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
   String terms = '';
   String policy = '';
 
-<<<<<<< SP-1737-FE-The-user-appears-as-Null-and-the-project-uuid-is-null-when-we-login-in-after-a-credentials-error
   HomeBloc() : super(HomeInitial()) {
-=======
-  HomeBloc() : super((HomeInitial())) {
->>>>>>> dev
     on<FetchUserInfo>(_fetchUserInfo);
     on<FetchTermEvent>(_fetchTerms);
     on<FetchPolicyEvent>(_fetchPolicy);