Squash

Author: gwynnemonahan

observability/network_observability/release_notes_archive/network-observability-operator-release-notes-archive.adoc

@@ -27,8 +27,12 @@ include::modules/network-observability-operator-release-notes-1-9-2-bug-fixes.ad
 //netobserv 1.7.0
 //netobserv 1.6.2
 //netobserv 1.6.1
-<<<<<<< HEAD
-//netobserv 1.6.0
+
+include::modules/network-observability-operator-release-notes-1-6-0-new-features-and-enhancements.adoc[leveloffset=+1]
+
+include::modules/network-observability-operator-release-notes-1-6-0-fixed-issues.adoc[leveloffset=+1]
+
+include::modules/network-observability-operator-release-notes-1-6-0-known-issues.adoc[leveloffset=+1]
 
 include::modules/network-observability-operator-release-notes-1-5-0.adoc[leveloffset=+1]
 
@@ -37,18 +41,6 @@ include::modules/network-observability-operator-release-notes-1-5-0-new-features
 include::modules/network-observability-operator-release-notes-1-5-0-fixed-issues.adoc[leveloffset=+1]
 
 include::modules/network-observability-operator-release-notes-1-5-0-known-issues.adoc[leveloffset=+1]
-=======
-
-include::modules/network-observability-operator-release-notes-1-6-0-new-features-and-enhancements.adoc[leveloffset=+1]
-
-include::modules/network-observability-operator-release-notes-1-6-0-technology-preview-features.adoc[leveloffset=+1]
-
-include::modules/network-observability-operator-release-notes-1-6-0-fixed-issues.adoc[leveloffset=+1]
-
-include::modules/network-observability-operator-release-notes-1-6-0-known-issues.adoc[leveloffset=+1]
-
-//netobserv 1.5.0
->>>>>>> 9ad2bd70f0 (OSDOCS-15827 [NETOBSERV] Refactor release notes 1.6.0)
 
 include::modules/network-observability-operator-release-notes-1-4-2.adoc[leveloffset=+1]