Author: brett
Date: Sat Mar 2 09:32:44 2013
New Revision: 1451864
URL: http://svn.apache.org/r1451864
Log:
fix bad merge
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test?rev=1451864&r1=1451863&r2=1451864&view=diff
==============================================================================
---
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
(original)
+++
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/test/resource/NPANDAY_571/WorkerRole1/pom.test
Sat Mar 2 09:32:44 2013
@@ -59,7 +59,6 @@
<groupId>Microsoft.WindowsAzure.ServiceRuntime</groupId>
<artifactId>Microsoft.WindowsAzure.ServiceRuntime</artifactId>
<version>1.7.0.0</version>
- <type>dotnet-library</type>
<type>gac_msil</type>
<classifier>31bf3856ad364e35</classifier>
</dependency>
@@ -73,7 +72,6 @@
<groupId>System.Data.Services.Client</groupId>
<artifactId>System.Data.Services.Client</artifactId>
<version>4.0.0.0</version>
- <type>dotnet-library</type>
<type>gac_msil4</type>
<classifier>b77a5c561934e089</classifier>
</dependency>
