Merge branch 'master' of
ssh://ivinnykov@git.eclipse.org/gitroot/www.eclipse.org/subversive.git
Conflicts:
_projectCommon.php
diff --git a/_projectCommon.php b/_projectCommon.php
index e8fbf88..ce23b32 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -13,7 +13,11 @@
# Break the navigation into sections
$Nav->addNavSeparator("About Subversive", "http://www.eclipse.org/projects/project_summary.php?projectid=technology.subversive");
+<<<<<<< HEAD
$Nav->addNavSeparator("Subversive Home", "/subversive/index.php", "_self", 1);
+=======
+ $Nav->addNavSeparator("Home", "/subversive/index.php", "_self", 1);
+>>>>>>> branch 'master' of ssh://ivinnykov@git.eclipse.org/gitroot/www.eclipse.org/subversive.git
$Nav->addNavSeparator("Downloads", "/subversive/downloads.php", "_self");
$Nav->addCustomNav("Latest Releases", "/subversive/latest-releases.php", "_self", 1);
@@ -47,7 +51,7 @@
# top navigation bar
# To override and replace the navigation with your own, uncomment the line below.
$Menu->setMenuItemList(array());
- $Menu->addMenuItem("Subversive Home", "/subversive/index.php", "_self");
+ $Menu->addMenuItem("Home", "/subversive/index.php", "_self");
$Menu->addMenuItem("Downloads", "/subversive/downloads.php", "_self");
$Menu->addMenuItem("Documentation", "/subversive/documentation.php", "_self");
$Menu->addMenuItem("Support", "/subversive/support.php", "_self");
@@ -63,4 +67,4 @@
# If you have Google Analytics code, use it here
$App->SetGoogleAnalyticsTrackingCode("UA-129970-16");
-?>
\ No newline at end of file
+?>
