diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.doc/html/etrice-docse37.html')
| -rw-r--r-- | plugins/org.eclipse.etrice.doc/html/etrice-docse37.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.doc/html/etrice-docse37.html b/plugins/org.eclipse.etrice.doc/html/etrice-docse37.html index 972a64b27..fdf5916f7 100644 --- a/plugins/org.eclipse.etrice.doc/html/etrice-docse37.html +++ b/plugins/org.eclipse.etrice.doc/html/etrice-docse37.html @@ -10,7 +10,11 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" />
<!-- xhtml,3,next,html -->
<meta name="src" content="etrice-doc.tex" />
+<<<<<<< Upstream, based on branch 'master' of ssh://hrentzreich@git.eclipse.org:29418/etrice/org.eclipse.etrice.git <meta name="date" content="2013-06-14 00:16:00" />
+======= +<meta name="date" content="2013-06-14 08:45:00" />
+>>>>>>> 1fbdb27 [doc] fixed problem with colored eTrice in headings <link rel="stylesheet" type="text/css" href="etrice-doc.css" />
</head><body
>
|