From 2157f93f364affcc2367f2e10c17950be25bc5a5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 7 Feb 2022 10:47:07 -0500 Subject: [PATCH] Clean up merge conflict remnants --- docs/release-notes/version-3.1.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 7536ebeb4..27aaa4b4c 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -1,8 +1,5 @@ # NetBox v3.1 -<<<<<<< HEAD -## v3.1.7 (FUTURE) -======= ## v3.1.7 (2022-02-03) ### Enhancements @@ -29,7 +26,6 @@ * [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission * [#8512](https://github.com/netbox-community/netbox/issues/8512) - Correct file permissions to allow execution of housekeeping script * [#8527](https://github.com/netbox-community/netbox/issues/8527) - Fix display of changelog retention period ->>>>>>> develop ---