merged with master

Author: kyuan-mongodb

source/release-notes.txt

@@ -17,7 +17,6 @@ MongoDB Charts Release Notes
 
 Improvements in this release:
 
-<<<<<<< HEAD
 - |charts-short| now supports a new chart type: :ref:`Candlestick Charts
   <candlestick-chart-ref>`.
 - Dashboard viewers can save a dashboard as a |png|.
@@ -26,24 +25,11 @@ Improvements in this release:
 - You can programmatically customize your embedded charts using the :ref:`new
   rendering specifications <rendering-spec-options>`.
 - The |charts-short| timeout limit increased to 10 minutes for
-=======
-- New chart type: :ref:`Candlestick Charts <candlestick-chart-ref>`
-- Dashboard viewers can save a dashboard as a |png|.
-- |charts-short| now supports :ref:`visualizing your Atlas billing data
-  <billing-dashboards>` directly inside the |charts| application.
-- Programmatically customize your embedded charts using the :ref:`new
-  rendering specifications <rendering-spec-options>`.
-- |charts-short| timeout limit increased to 10 minutes for
->>>>>>> e13334f (v1.39 release notes)
   experimentation. 
 
   .. note::
 
-<<<<<<< HEAD
      Please contact `MongoDB Support <https://support.mongodb.com/welcome>`__ to set up the timeout limit increase.
-=======
-     Please contact `MongoDB Support <https://support.mongodb.com/welcome>`__ to set it up.
->>>>>>> e13334f (v1.39 release notes)
 
 Bug fixes in this release: