Fix typo

geoadmin · Jun 18, 2014 · 7310d6b · 7310d6b
1 parent 46278e2
commit 7310d6b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/chsdi/static/doc/source/releasenotes/index.rst b/chsdi/static/doc/source/releasenotes/index.rst
@@ -23,7 +23,6 @@ Geodata
 +--------+----------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Update | `Topographical landscape model <//map.geo.admin.ch/?layers=ch.swisstopo.swisstlm3d-karte-farbe>`__ (ch.swisstopo.swisstlm3d-karte-farbe)                 |
 +--------+----------------------------------------------------------------------------------------------------------------------------------------------------------+
->>>>>>> add release notes with tlm3d-karte layer updates
 
 Release 20140611 - Wednesday, June 11th 2014
 ============================================