fix conflict

diff --git a/README.rst b/README.rst
index a39b5ff2e92624bc727550ac93098bd29df1ce2b..d07ee7df51c91a9223ee4432f9e813659f5389e7 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -2,6 +2,9 @@
 Collaborative multimedia asset management system
 =================================================
 
+.. image:: /images/logo_telemeta_2.png
+    :alt: Telemeta logo
+
 Overview
 =========
 
@@ -71,6 +74,8 @@ News
 1.6
 ++++
 
+Telemeta is now usable on any OS, ready for development and for production use cases in 5 mn! B-)
+
 * Provide a docker image and composition for the full Telemeta application bundle.
 
   One month after the publication of docker-compose around march 2015, we had managed to build a prototyped composition which bundled all the dependencies of Telemeta and TimeSide. It took almost one year to deeply investigate all the capabilities of Docker and various images to finally release a propoer composition which bundles all the necessary applications and modules. So we can say that Telemeta is now usable on **any OS** in 5 mn! B-)
@@ -83,12 +88,6 @@ News
 * Switch to Affero GPL licence
 * Upgrade of every dependency bundle in the composition
 * Many, many `bugfixes <https://github.com/Parisson/Telemeta/issues?q=is%3Aissue+is%3Aclosed>`_
-
-=======
-Telemeta is now usable on any OS, ready for development and for production use cases in 5 mn! B-)
-
-* Provide a docker image and composition for the full Telemeta application bundle including more useful modules and apps.
->>>>>>> doc
 * Thanks to all partners for this **huge** release!
 
 1.5.1