运行 manage.py runserver 后出现 django 错误

Question

运行“python manage.py runserver”后出现这个奇怪的错误 它是在我将我的 repo 推送到 github 之后开始的。 无论我在哪里尝试命令（virtualenv 或系统），我都会得到相同的错误，只是路径不同。

这里的错误：

Traceback (most recent call last):


  File "manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)


  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/core/management/__init__.py", line 399, in execute_from_command_line
    utility.execute()

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/core/management/__init__.py", line 392, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/core/management/__init__.py", line 261, in fetch_command
    commands = get_commands()

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/core/management/__init__.py", line 107, in get_commands
    apps = settings.INSTALLED_APPS

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/conf/__init__.py", line 54, in __getattr__
    self._setup(name)

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/conf/__init__.py", line 49, in _setup
    self._wrapped = Settings(settings_module)

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/conf/__init__.py", line 128, in __init__
    mod = importlib.import_module(self.SETTINGS_MODULE)

  File "/usr/local/lib/python2.7/dist-packages/Django-1.6.5-py2.7.egg/django/utils/importlib.py", line 40, in import_module
    __import__(name)

  File "/home/moonith/Dokumenty/Python/django-justme/justme/Rango/settings.py", line 57
    <<<<<<< HEAD
     ^
SyntaxError: invalid syntax

你有什么想法可以解决这个问题吗？

Answer 1

settings.py 包含合并后的所有 <<<<<<<<<s。把它们弄出来，你应该没事。