fixed merge conflict linting issues

Author: kevinlacaille

planet/cli/data.py

@@ -19,15 +19,12 @@
 import click
 
 from planet.reporting import StateBar
-from planet import data_filter, DataClient
-from planet.clients.data import (SEARCH_SORT,
-
 from planet import data_filter, DataClient, exceptions
-from planet.clients.data import (LIST_SEARCH_TYPE,
+from planet.clients.data import (SEARCH_SORT,
+                                 LIST_SEARCH_TYPE,
                                  LIST_SEARCH_TYPE_DEFAULT,
                                  LIST_SORT_ORDER,
                                  LIST_SORT_DEFAULT,
-                                 SEARCH_SORT,
                                  SEARCH_SORT_DEFAULT,
                                  STATS_INTERVAL)
 

tests/integration/test_data_cli.py

@@ -113,6 +113,7 @@ def _func():
 
     return _func
 
+
 def item_descriptions(get_test_file_json):
     item_ids = [
         '20220125_075509_67_1061',
@@ -123,7 +124,6 @@ def item_descriptions(get_test_file_json):
     return items
 
 
-
 def test_data_command_registered(invoke):
     """planet-data command prints help and usage message."""
     runner = CliRunner()