[Live-demo] [OSGeo] #1967: conficts in file overview.rst at the bottom - looks like a merge error

[OSGeo]

#1967: conficts in file overview.rst at the bottom - looks like a merge error
-------------------------+---------------------------
 Reporter:  astrid_emde  |      Owner:  live-demo@…
     Type:  task         |     Status:  new
 Priority:  normal       |  Milestone:  OSGeoLive11.0
Component:  LiveDVD      |   Keywords:
-------------------------+---------------------------
 * https://github.com/OSGeo/OSGeoLive-
 doc/edit/master/en/overview/overview.rst

--
Ticket URL: <https://trac.osgeo.org/osgeo/ticket/1967>
OSGeo <http://www.osgeo.org/>
OSGeo committee and general foundation issue tracker.