mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code

Clean up merge conflict remnants

Browse Source
This commit is contained in:
jeremystretch
2022-02-07 10:47:07 -05:00
parent 3651ef53e3
commit 2157f93f36
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/version-3.1.md
View File

@ -1,8 +1,5 @@
# NetBox v3.1 # NetBox v3.1
<<<<<<< HEAD
## v3.1.7 (FUTURE)
=======
## v3.1.7 (2022-02-03) ## v3.1.7 (2022-02-03)
### Enhancements ### Enhancements
@ -29,7 +26,6 @@
* [#8499](https://github.com/netbox-community/netbox/issues/8499) - Content types REST API endpoint should not require model permission * [#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 * [#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 * [#8527](https://github.com/netbox-community/netbox/issues/8527) - Fix display of changelog retention period
>>>>>>> develop
--- ---