Removed git symbols

drones/cli.py

@@ -1,19 +1,11 @@
 import argparse
-<<<<<<< Updated upstream
-from datetime import datetime, timedelta
-from distutils.util import strtobool
-from contextlib import contextmanager
-import logging
-from typing import List, Optional, Generator
-=======
 import json
 import logging
 import time
 from contextlib import contextmanager
 from datetime import datetime, timedelta
 from distutils.util import strtobool
 from typing import Any, Dict, Generator, List, Optional
->>>>>>> Stashed changes
 from uuid import UUID
 import time