c3d2/c3d2-web
c3d2
/
c3d2-web
37
3
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

fahrplan.xml fixed

This commit is contained in:
koeart 2011-09-23 12:27:36 +02:00
parent 055ac9d451
commit 9fa0078ebb
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/datenspuren/fahrplan.xml
View File

@ -2,16 +2,6 @@
<!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
<page title="Fahrplan">
<<<<<<< HEAD
<include src="../static/datenspuren/fahrplan/index.de.htlm"/>
<!--<include-pentabarf-schedule src="../static/datenspuren/fahrplan/index.de.html"/>-->
<!--<p>
<link href="https://cccv.pentabarf.org/submission/ds2011">Einreichungen für DS2011</link>
</p>-->
<!-- <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day/2010-10-16.de.html"/>
<include-pentabarf-schedule src="../static/datenspuren/fahrplan/day/2010-10-17.de.html"/>-->
=======
<include-pentabarf-schedule src="../static/datenspuren/fahrplan/day_2011-10-15.de.html"/>
<include-pentabarf-schedule src="../static/datenspuren/fahrplan/day_2011-10-16.de.html"/>
>>>>>>> 22946d0136ab177d90228ec5a4cfb20142312f89
</page>