manage.py runserver를 실행 한 후 django 오류가 발생했습니다.

Question

"python manage.py runserver"를 실행 한 후이 wierd 오류가 발생합니다. gotoub에 내 repo를 푸시 한 후 시작되었습니다. 아무리 내가 command (virtualenv 또는 system)를 시도해도 동일한 오류가 발생한다. 여기

오류 :

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에는 모두 병합 후 <<<<<<<<<이 들어 있습니다. 그들을 데리고 나오면 괜찮을거야.