From cdd15f3769294dcc6d12a0c4e2a81369ace85442 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 12 May 2017 18:23:35 +0100 Subject: [PATCH] Remove broken bit of merge commit --- docs/topics/release-notes.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index a80f5933e..ebb1de3d4 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -680,7 +680,6 @@ For older release notes, [please see the version 2.x documentation][old-release- [old-release-notes]: https://github.com/encode/django-rest-framework/blob/version-2.4.x/docs/topics/release-notes.md [3.6-release]: 3.6-announcement.md -<<<<<<< HEAD [3.0.1-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.1+Release%22 [3.0.2-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.2+Release%22 [3.0.3-milestone]: https://github.com/tomchristie/django-rest-framework/issues?q=milestone%3A%223.0.3+Release%22