update disount

lib/pages/discount/model/discount_model.dart

@@ -1,11 +1,6 @@
-<<<<<<< HEAD
-import 'dart:ffi';
-
-=======
 import 'dart:async';
 
 import 'package:cloud_firestore/cloud_firestore.dart';
->>>>>>> upstream/master
 import 'package:fcs/data/services/services.dart';
 import 'package:fcs/domain/entities/discount.dart';
 import 'package:fcs/pages/main/model/base_model.dart';
@@ -16,11 +11,8 @@ class DiscountModel extends BaseModel {
 
   StreamSubscription<QuerySnapshot> listener;
 
-<<<<<<< HEAD
-=======
   List<Discount> discounts = [];
 
->>>>>>> upstream/master
   void initUser(user) {
     super.initUser(user);
     _load();
@@ -61,10 +53,4 @@ class DiscountModel extends BaseModel {
   Future<void> deleteDiscount(Discount discount) async {
     return Services.instance.commonService.deleteDiscount(discount.id);
   }
-
-  Future<void> addDiscount(Discount discount) {}
-
-  Future<void> updateDiscount(Discount discount) {}
-
-  Future<void> deleteCargoType(String id) {}
 }