aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoir2011-12-05 09:40:30 (EST)
committerkmoir2011-12-05 09:40:30 (EST)
commit60cc526ceece0e506a4263cee7d45dc1670587ea (patch)
treed6b45fcf079c95b1d7f74c29bcef20432c7fa076
parent27909e46b32b4aedab4621afd155bff5ef04a477 (diff)
downloadeclipse.platform.releng.maps-60cc526ceece0e506a4263cee7d45dc1670587ea.zip
eclipse.platform.releng.maps-60cc526ceece0e506a4263cee7d45dc1670587ea.tar.gz
eclipse.platform.releng.maps-60cc526ceece0e506a4263cee7d45dc1670587ea.tar.bz2
Bug 365573 - team map is broken by SDK build
-rw-r--r--org.eclipse.releng/maps/team.map3
1 files changed, 0 insertions, 3 deletions
diff --git a/org.eclipse.releng/maps/team.map b/org.eclipse.releng/maps/team.map
index 90cde3e..ec08ee1 100644
--- a/org.eclipse.releng/maps/team.map
+++ b/org.eclipse.releng/maps/team.map
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
!*************** TEAM CONTRIBUTION ********************************************************
plugin@org.eclipse.team.core=GIT,tag=I20110525-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.team.core
@@ -24,4 +22,3 @@ fragment@org.eclipse.core.net.win32.x86=GIT,tag=I20110331-0827,repo=git://git.ec
fragment@org.eclipse.core.net.linux.x86=GIT,tag=I20110419-0800,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86
fragment@org.eclipse.core.net.linux.x86_64=GIT,tag=I20110331-0827,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64
fragment@org.eclipse.core.net.win32.x86_64=GIT,tag=I20110331-0827,repo=git://git.eclipse.org/gitroot/platform/eclipse.platform.team.git,path=bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64
->>>>>>> 8b867c6e96110fd0459efaf57715e560efaba59c