check

iiitv · Oct 30, 2021 · 9e9535f · 9e9535f
1 parent d26b43d
commit 9e9535f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/lib/ui/utils/MenuWidget.dart b/lib/ui/utils/MenuWidget.dart
@@ -7,18 +7,13 @@ import '../../styles.dart';
 import '../../util/google_sign_in.dart';
 import 'package:sliding_switch/sliding_switch.dart';
 import 'package:auto_size_text/auto_size_text.dart';
-<<<<<<< HEAD:lib/ui/MenuWidget.dart
+import '../pages/event_list_page.dart';
+import '../pages/app_feedback_page.dart';
 import 'event_list.dart';
-import 'app_feedback_page.dart';
+import 'app_feedback.dart';
 import 'event_details.dart';
 import 'event_list.dart';
-import 'event_list_page.dart';
-=======
-
-import '../pages/app_feedback_page.dart';
-import 'event_details.dart';
-import '../pages/event_list_page.dart';
->>>>>>> 61cd5ac99555326df304af417ef7719d406325a8:lib/ui/utils/MenuWidget.dart
+import 'event_list.dart';
 
 //Drawer Code
 class MenuWidget extends StatefulWidget {

diff --git a/lib/ui/utils/past_event_list.dart b/lib/ui/utils/past_event_list.dart
@@ -1,7 +1,7 @@
 import 'package:club_calendar/styles.dart';
 import 'package:club_calendar/ui/utils/past_event_details.dart';
 import 'package:flutter/material.dart';
-import 'package:club_calendar/ui/MenuWidget.dart';
+import 'MenuWidget.dart';
 import '../widgets/EventCard.dart';
 import 'event_list.dart';
 

diff --git a/lib/ui/widgets/EventCard.dart b/lib/ui/widgets/EventCard.dart
@@ -1,6 +1,6 @@
 import 'package:club_calendar/styles.dart';
-import 'package:club_calendar/ui/MenuWidget.dart';
 import 'package:flutter/material.dart';
+import 'MenuWidget.dart';
 
 class EventCard extends StatefulWidget {