X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docs%2Frelease-notes.rst;h=3e270421389ae27b96bf379b8721618d00f7cacf;hb=refs%2Fchanges%2F44%2F444%2F2;hp=ff4e6b9e72df5752a03f3324f0d976f13a069bf2;hpb=5b686151904e2582ea9ce9d2f1c6abb7a400afa5;p=portal%2Fric-dashboard.git

diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index ff4e6b9e..3e270421 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,12 +20,12 @@
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.0.5, 28 June 2019
+Version 1.0.5, 1 July 2019
 ---------------------------
 * Upgrade to Angular version 8
 * Upgrade to Spring-Boot 2.1.6.RELEASE
 * Fixed AC xApp policy page title is not aligned
-* Update E2 manager client to spec version 20190626
+* Update E2 manager client to spec version 20190630
 * Add configuration-driven mock of E2 getNodebIdList
 
 Version 1.0.4, 27 June 2019
@@ -49,13 +49,8 @@ Version 1.0.4, 27 June 2019
 * Update App manager client to spec version 0.1.5
 * Move RAN connection feature to control screen
 * Rework admin table
-<<<<<<< HEAD
-* Update the notification service
-* Remove the RAN connection invocation link from left menu and move it to control screen
-=======
 * Update the notification service 
 * Move RAN connection feature to control screen
->>>>>>> Upgrade E2 to version 20190626
 * Repair deploy-app feature and use icon instead of text button
 
 Version 1.0.3, 28 May 2019