Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPauline DEVILLE2021-12-16 11:07:23 -0500
committerPauline DEVILLE2021-12-16 11:07:23 -0500
commit41ff0f77b6f48c66a9b28c3e72b8943c4cbd542a (patch)
tree1279115a934e11382cc95d6b4fe859702fb91352
parent1c8b44b58b5c5460eecb480dfe7576f86cb1fc8d (diff)
downloadorg.eclipse.papyrus-bugs/6.0.0_RCP.tar.gz
org.eclipse.papyrus-bugs/6.0.0_RCP.tar.xz
org.eclipse.papyrus-bugs/6.0.0_RCP.zip
[Releng] Fixe product xml formatingbugs/6.0.0_RCP
Change-Id: I28e3a986aae36548def0ddbe515b99388844eacc Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product5
1 files changed, 0 insertions, 5 deletions
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index 555faf7b871..3569c6a8375 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -209,13 +209,8 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<repositories>
<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
<repository location="https://download.eclipse.org/releases/latest/" enabled="true" />
-<<<<<<< HEAD (3cd378 Bug 576227 - [Releng] Update to build the RCP base on 2021-1)
- <repository location="http://https://download.eclipse.org/releases/2021-12/" enabled="true" />
- <repository location="http://https://download.eclipse.org/eclipse/updates/4.22/" enabled="true" />
-=======
<repository location="https://download.eclipse.org/releases/2021-12/" enabled="true" />
<repository location="https://download.eclipse.org/eclipse/updates/4.22/" enabled="true" />
->>>>>>> CHANGE (7893db [Releng] Add market place to the rcp)
</repositories>
<preferencesInfo>

Back to the top