fix conficts
Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>
diff --git a/.project b/.project
index 5a13989..32cf38a 100644
--- a/.project
+++ b/.project
@@ -6,26 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
-<<<<<<< Upstream, based on origin/master
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.dltk.core.scriptbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.php.core.PHPNature</nature>
-=======
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
@@ -44,6 +24,5 @@
<natures>
<nature>org.eclipse.php.core.PHPNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
->>>>>>> 5f53f2a update eclipse .project
</natures>
</projectDescription>
diff --git a/index.php b/index.php
index 5f5ebf5..e3747f8 100644
--- a/index.php
+++ b/index.php
@@ -25,69 +25,9 @@
// Place your html content in a file called content/en_pagename.php
ob_start();
-<<<<<<< Upstream, based on origin/master
- ?>
-<script type="text/javascript" src="functions.js"></script>
-<link rel="stylesheet" type="text/css" href="style.css" media="screen" />
-<div id="widecontainer">
- <div id="contentContainer">
-
- <p class="intro">So you want to help? Great! You don't have to be an Eclipse guru or code monkey to help. There are many ways to participate in the Eclipse community. </p>
-
- <h2>Report Bugs and Enhancements</h2>
- <ul>
- <li>Download one of the latest <a href="/downloads/index-developer.php">Eclipse Package Milestone Builds</a>. Take it for a test drive before the final release and <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">report any bugs</a> you find.</li>
- <li><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">Report Enhancements</a>: Got an idea for a killer feature? Or maybe something you use often could use some tweaking? Post an enhancement request!</li>
- </ul>
-
-
- <h2>Fix Bugs or Implement Enhancements</h2>
- <ul>
- <li><a href="/legal/CLA.php">Sign a Contributor License Agreement</a></li>
- <li><a href="http://bugs.eclipse.org/bugs/query.cgi">Is there some bug</a> that really bothers you? Instead of just reporting it, fix it. And there are <a href="http://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted&resolution=---">many bugs marked with helpwanted</a>.
- <br/><br/> To learn how the bug-fixing process works, check out the <a href="http://wiki.eclipse.org/Bug_Reporting_FAQ">bug reporting FAQ</a>:
- <br/> To learn about the lifecycle of bugzilla entries, check out the <a href="http://wiki.eclipse.org/Development_Resources/HOWTO/Bugzilla_Use">development process</a></li>
-
- <li><a href="http://wiki.eclipse.org/Google_Summer_of_Code">Google Summer of Code</a>: Participate and get paid for coding! </li>
- </ul>
-
- <h2>Become a Committer</h2>
- <ul>
- <li>Start a <a href='http://wiki.eclipse.org/Development_Resources/HOWTO/Starting_A_New_Project'>new project</a> or become a committer on an <a href="/projects/listofprojects.php">existing project</a></li>
- </ul>
-
- <h2>Promote Eclipse Technologies</h2>
- <ul>
- <li>Teach with Eclipse. Check out our <a href="/university-outreach/">University Outreach</a> program.</li>
- <li>Let other people know that your application is <a href="/artwork">Built on Eclipse or Eclipse Ready</a></li>
- <li>Do you or your company have a success story about Eclipse? Send us a <a href="/community/news/eclipseinthenews.php">story</a> and we'll help you spread the word</li>
- <li>Follow the Eclipse community on <a href="http://wiki.eclipse.org/Twitter">Twitter</a></li>
- </ul>
-
- <h2>Share Your Knowledge</h2>
- <ul>
- <li>Help other users on the <a href="/forums/">forums</a> or on <a href="http://wiki.eclipse.org/IRC">IRC</a></li>
- <li>Share your Eclipse <a href="/resources/">article</a>, <a href="http://planet.eclipse.org/planet/">blog</a> or <a href="http://live.eclipse.org/">multi-media presentation</a>.</li>
- <li>Contribute your knowledge to the <a href="http://wiki.eclipse.org">Eclipse Wiki</a></li>
- <li>Localization: Help <a href="http://babel.eclipse.org/">translate Eclipse</a> into other languages </li>
- </ul>
-
-
- <h2>Donate</h2>
- <ul>
- <li>Individuals: Make a donation and become a <a href="/donate/">Friend of Eclipse</a></li>
- <li>Companies and Organizations: <a href="/membership/become_a_member/">Become a Member</a></li>
- </ul>
-
-
-
- </div>
-</div>
- <?
-=======
include("content/en_" . $App->getScriptName());
->>>>>>> ebb2ca1 Bug 432360 - Update content and l&f of /contribute
+
$html = ob_get_clean();
// Custom theme variables
