From 157ce0b4a9a917b827cbc5ecbf0a962075257545 Mon Sep 17 00:00:00 2001
From: Shubhamshirva <shubhamshirva@gmail.com>
Date: Mon, 22 Jul 2024 11:33:10 +0530
Subject: [PATCH] conflicts resolved

---
 .../ProfileTab/Following/Following.dart       | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart b/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart
index 88aab2b..549f50c 100644
--- a/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart	
+++ b/lib/Feed Module/Main_Screens/ProfileTab/Following/Following.dart	
@@ -288,23 +288,35 @@ class _FollowingState extends State<Following> {
                                                     ),
 
                                                   ),
+                                                ]
                                                 ),
-                                              )),
+                                      ]
+                                              )
+                                              ),
                                         ],
-                                      ),
-                                    ),
-                                  ],
-                                ),
-                              );
-                            },
-                          );
+                                      );
+                            }
+                                    );
                   }
-                },
-              ),
-            ])
-          ]))
-        ],
-      ),
+                }
+              )
+              
+  
+                                  ],
+  
+                                ),
+              ]
+                              )
+      )]
+
+        
+      )
+    );
+  }
+  
+                            
+                          
+              
 
       // Stack(
       //   children: [
@@ -556,8 +568,6 @@ class _FollowingState extends State<Following> {
       //     ]))
       //   ],
       // ),
-    );
-  }
 
   Widget _buildNoDataBody(context) {
     return Center(