Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian de Alwis2016-05-19 14:15:38 +0000
committerBrian de Alwis2016-05-19 14:16:35 +0000
commit9d996d34f1d5b83f7599db3f362a3a300dadad6e (patch)
tree0e7370939c00926ceb29414baeae61ded55daa26 /packages/org.eclipse.epp.package.committers
parent544268b65ebb8100418a93f9088f207d280c7a2e (diff)
downloadorg.eclipse.epp.packages-9d996d34f1d5b83f7599db3f362a3a300dadad6e.tar.gz
org.eclipse.epp.packages-9d996d34f1d5b83f7599db3f362a3a300dadad6e.tar.xz
org.eclipse.epp.packages-9d996d34f1d5b83f7599db3f362a3a300dadad6e.zip
Bug 490045 - [Welcome] Adopt Solstice theme for Committers package
Remove missed merge conflict marker Change-Id: I42f81a045016f06f4c2777a45bb8567e4d8c9953 Signed-off-by: Brian de Alwis <bsd@mt.ca>
Diffstat (limited to 'packages/org.eclipse.epp.package.committers')
-rw-r--r--packages/org.eclipse.epp.package.committers/plugin.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/org.eclipse.epp.package.committers/plugin.xml b/packages/org.eclipse.epp.package.committers/plugin.xml
index a5bede52..e2418f13 100644
--- a/packages/org.eclipse.epp.package.committers/plugin.xml
+++ b/packages/org.eclipse.epp.package.committers/plugin.xml
@@ -425,10 +425,7 @@
<command
id="org.eclipse.oomph.setup.ui.questionnaire"
importance="high"
-<<<<<<< Updated upstream
-=======
icon="platform:/plugin/org.eclipse.ui.intro.universal/themes/solstice/graphics/icons/ctool/settings.png"
->>>>>>> Stashed changes
label="%ql.setupQuestionnaire.label">
</command>
<override

Back to the top