Merge branch 'main' into develop

nautobot · Aug 22, 2024 · 7b5a793 · 7b5a793
2 parents c03b810 + a42a566
commit 7b5a793
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/docs/release_notes.md b/docs/release_notes.md
@@ -12,12 +12,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.3.0] - 2024-03-05
 
+<<<<<<< HEAD
 ### Added
+=======
+### Added 
+>>>>>>> main
 
 - Added `nb-use-fields-all` rule (#70)
 - Added `nautobot-sub-class-name` rule (#74)
 
+<<<<<<< HEAD
 ### Changed
+=======
+### Changed 
+>>>>>>> main
 
 - Improve incorrect base class checker (#72)
 - Update CODEOWNERS (#68)