Fix conflict

Author: Paul Hallett

README.md

@@ -28,10 +28,4 @@ In order to overcome these problems, this styleguide tries to achieve the follow
 
 # Read the styleguide
 
-<<<<<<< HEAD
 The styleguide is now published as a readable documentation site. You can view it at [https://phalt.github.io/django-api-domains/](https://phalt.github.io/django-api-domains/) or view the [docs](docs/) folder directly.
-=======
-* Django's own documentation and recommendations: https://docs.djangoproject.com/en/dev/
-* The HackSoftware Django-styleguide: https://github.com/HackSoftware/Django-Styleguide
-* Model-driven engineering: https://en.wikipedia.org/wiki/Model-driven_engineering
->>>>>>> 121f94e1b396709ccb5c8be21e40cb371b66c521

docs/index.md renamed to docs/README.md

@@ -2,7 +2,7 @@ site_name: Django API Domains
 theme: readthedocs
 
 pages:
- - Home: 'index.md'
+ - Home: 'README.md'
  - Domains: 'domains.md'
  - Styleguide: 'styleguide.md'
  - Files: 'files.md'