git diff WTF on imports
ActivePublic
Actions

Authored by tenma on Sep 11 2020, 5:06 PM.

Tags

None

Subscribers

None

	import asyncio
	<<<<<<< HEAD
	from pathlib import PosixPath
	from typing import List, Dict, Tuple, Iterator, Union, Iterable, Pattern, Any

	import aiohttp
	=======
	import fnmatch
	import glob
	import itertools
	import os
	from pathlib import Path
	import re
	from typing import List, Dict, Tuple, Iterator, Union, Iterable, Pattern
	>>>>>>> 544176f... refactor non-cli code out of cli in swh-scanner

	import aiohttp

	from swh.model.from_disk import Directory, Content, accept_all_directories
	from swh.model.identifiers import (
	swhid,
	parse_swhid,
	DIRECTORY,
	CONTENT,
	)

	from .exceptions import InvalidDirectoryPath, error_response
	from .model import Tree
	from .plot import generate_sunburst
	from .dashboard.dashboard import run_app

git diff WTF on importsActivePublicActions