From aee6aa6053aa28f108479acd9110543981ca333c Mon Sep 17 00:00:00 2001
From: unknown <hillelcoren@gmail.com>
Date: Sun, 5 Aug 2018 16:38:03 +0300
Subject: [PATCH] Merge fixes

---
 lib/redux/app/app_actions.dart            | 1 -
 lib/redux/product/product_middleware.dart | 2 +-
 lib/ui/client/client_list.dart            | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/redux/app/app_actions.dart b/lib/redux/app/app_actions.dart
index 1c33d829e..31744d7c6 100644
--- a/lib/redux/app/app_actions.dart
+++ b/lib/redux/app/app_actions.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-
 import 'package:invoiceninja_flutter/data/models/entities.dart';
 
 class PersistUI {}
diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart
index 9a7850930..0e36c3223 100644
--- a/lib/redux/product/product_middleware.dart
+++ b/lib/redux/product/product_middleware.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
-import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
+import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/ui/product/edit/product_edit_vm.dart';
 import 'package:invoiceninja_flutter/ui/product/product_screen.dart';
 import 'package:redux/redux.dart';
diff --git a/lib/ui/client/client_list.dart b/lib/ui/client/client_list.dart
index e8b8e8212..361b9ca44 100644
--- a/lib/ui/client/client_list.dart
+++ b/lib/ui/client/client_list.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/ui/app/loading_indicator.dart';
-import 'package:invoiceninja_flutter/ui/client/client_list_item.dart';
 import 'package:invoiceninja_flutter/ui/client/client_list_vm.dart';
+import 'package:invoiceninja_flutter/ui/client/client_list_item.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 
 class ClientList extends StatelessWidget {