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

Question

我在运行“python manage.py runserver”时遇到了一个奇怪的错误。这个问题是在我把我的代码库推送到GitHub之后开始出现的。不管我在虚拟环境还是系统上运行这个命令，都会出现同样的错误，只是路径不同。

这里是错误信息：

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 文件里有很多像 <<<<<<<<< 这样的标记，这是因为在合并代码的时候出现了冲突。把这些标记删掉，问题就解决了。