[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      |  Resolution:
 Keywords:               |
-------------------------+----------------------------

Comment (by darkblueb):

 fixed in https://github.com/OSGeo/OSGeoLive-
 doc/commit/d8fa556f94f5ba3a5ce99fe0b40f855e0f963925
 {{{
 -- compare
 }}}
 https://github.com/OSGeo/OSGeoLive-doc/compare/ff20fe197a41...d8fa556f94f5

 --
 will close on confirm

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