From c567a09ca107d9a2d8b69a287ede0bdc76d81122 Mon Sep 17 00:00:00 2001
From: Moe <moe@chocola.dev>
Date: Tue, 26 Apr 2022 17:28:45 +0700
Subject: [PATCH] Fix conflict

---
 lib/components/menu.dart | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/lib/components/menu.dart b/lib/components/menu.dart
index 30fc7eb..0879454 100644
--- a/lib/components/menu.dart
+++ b/lib/components/menu.dart
@@ -3,13 +3,9 @@ import 'dart:math' as math;
 
 import 'package:nekoya_flutter/screens/products.dart';
 import 'package:nekoya_flutter/screens/register.dart';
-import 'package:nekoya_flutter/screens/checkout.dart';
-<<<<<<< HEAD
 import 'package:nekoya_flutter/screens/payment.dart';
-=======
 import 'package:nekoya_flutter/screens/cart.dart';
 import 'package:nekoya_flutter/screens/login.dart';
->>>>>>> 620e01fe7abd27cb77fbd0cb8586a12722911a08
 
 class Menu extends StatefulWidget {
   const Menu({Key? key}) : super(key: key);
@@ -53,11 +49,7 @@ class _MenuState extends State<Menu> {
       if (index == 0) {
         _selectedWidget = const Login();
       } else if (index == 1) {
-<<<<<<< HEAD
         _selectedWidget = const Payment();
-=======
-        _selectedWidget = const Checkout();
->>>>>>> 620e01fe7abd27cb77fbd0cb8586a12722911a08
       } else if (index == 2) {
         _selectedWidget = const Products();
       } else if (index == 3) {