Loading setup.py +5 −0 Original line number Original line Diff line number Diff line # -*- coding: utf-8 -*- # -*- coding: utf-8 -*- <<<<<<< HEAD """Installer for Spot package.""" """Installer for Spot package.""" ======= """Installer for Searx package.""" # Test auto sync >>>>>>> 06e179d0f1696b3dc6a66d1d01c178fcfafed5e5 from setuptools import setup from setuptools import setup from setuptools import find_packages from setuptools import find_packages Loading test.md 0 → 100644 +1 −0 Original line number Original line Diff line number Diff line Hello world Loading
setup.py +5 −0 Original line number Original line Diff line number Diff line # -*- coding: utf-8 -*- # -*- coding: utf-8 -*- <<<<<<< HEAD """Installer for Spot package.""" """Installer for Spot package.""" ======= """Installer for Searx package.""" # Test auto sync >>>>>>> 06e179d0f1696b3dc6a66d1d01c178fcfafed5e5 from setuptools import setup from setuptools import setup from setuptools import find_packages from setuptools import find_packages Loading
