mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-17 17:50:56 +00:00
fixed merge results for Header.ui.xml after adding Blog and moving text messages from StringMessages to TextMessages
This commit is contained in:
1 parent
a523c26fd3
commit
2cd993e44b
1 file changed
+5
-5
+5
-5
@@ -21,10 +21,10 @@
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n.home}" />
|
||||
<g:Anchor ui:field="eventsPageLink"
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n.events}" />
|
||||
<g:Anchor ui:field="solutionsPageLink"
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n.solutions}" />
|
||||
<g:Anchor href="http://blog.sapsailing.com"
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n.blog}" />
|
||||
<g:Anchor ui:field="solutionsPageLink"
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n_ubi.solutions}" />
|
||||
<g:Anchor href="http://blog.sapsailing.com"
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n_ubi.blog}" />
|
||||
<!--
|
||||
<g:Anchor ui:field="sponsoringPageLink"
|
||||
styleName="{local_res.css.sitenavigation_link}" text="{i18n.sponsoring}" />
|
||||
@@ -38,4 +38,4 @@
|
||||
</nav>
|
||||
</div>
|
||||
</g:HTMLPanel>
|
||||
</ui:UiBinder>
|
||||
</ui:UiBinder>
|
||||
Reference in new issue
Block a user