From a8e090df04c9574aee9990f82715841aa797e220 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 7 May 2013 17:14:25 +0100
Subject: Remove accidental conflict diff

---
 docs/tutorial/quickstart.md | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'docs/tutorial')

diff --git a/docs/tutorial/quickstart.md b/docs/tutorial/quickstart.md
index 627724c7..52fe3acf 100644
--- a/docs/tutorial/quickstart.md
+++ b/docs/tutorial/quickstart.md
@@ -76,11 +76,7 @@ Because we're using viewsets instead of views, we can automatically generate the
 
 Again, if we need more control over the API URLs we can simply drop down to using regular class based views, and writing the URL conf explicitly.
 
-<<<<<<< HEAD
-Note that we're also including default login and logout views for use with the browsable API.  That's optional, but useful if your API requires authentication and you want to use the browseable API.
-=======
 Finally, we're including default login and logout views for use with the browsable API.  That's optional, but useful if your API requires authentication and you want to use the browsable API.
->>>>>>> master
 
 ## Settings
 
-- 
cgit v1.2.3