commit be5562dea7538835070f622c2f3d01e4c79527c6
author ivinnykov <igor.vinnykov@polarion.com> Fri Apr 24 15:01:29 2015 +0300
committer ivinnykov <igor.vinnykov@polarion.com> Fri Apr 24 15:01:29 2015 +0300
tree 2e7a664edf4d51bd602cff7125cca5e20edd65aa
parent d2a8467fbd5846f97ae44ab3c465664145e6a249

Update menu

_projectCommon.php

diff --git a/_projectCommon.php b/_projectCommon.php
index ce23b32..eba752c 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -13,11 +13,7 @@
 	
 	# 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);