Fix merge conflict.

Author: FlipperPA

.gitignore

@@ -9,4 +9,5 @@ __pycache__
 /docs/_build
 /.htmlcov
 *.egg-info/
-.vscode/
+.vscode/
+venv/

djclick/__init__.py

@@ -7,7 +7,6 @@
 from .adapter import CommandRegistrator as command  # NOQA
 from .adapter import GroupRegistrator as group, pass_verbosity  # NOQA
 
-
 # The RegEx in setup.py requires single quotes. Rather than change it, turn off Black.
 # fmt: off
 __version__ = '2.2.0'

setup.py

@@ -87,7 +87,10 @@ def get_files(*bases):
     @staticmethod
     def get_metavar(name):
         data = Setup.read(os.path.join(PACKAGE, "__init__.py"))
+<<<<<<< HEAD
         print(name)
+=======
+>>>>>>> c3337038f32900ebc5e606c621f1f28b537f64b8
         value = (
             re.search(u"__{}__\s*=\s*u?'([^']+)'".format(name), data).group(1).strip()
         )