Permalink
Browse files

Merge pull request #25 from peter-budo/deprecateDeleteConflictingFiles

- Removed deprecated parameter deleteConflictingFiles as per issue 182 h...
  • Loading branch information...
2 parents 1126dd0 + 2d27bcb commit 9b0189046f9cd415b7ac196c3e08b802986f18dd @cescoffier cescoffier committed Feb 6, 2012
@@ -42,7 +42,6 @@
<avd>${emulator}</avd>
</emulator>
#end
- <deleteConflictingFiles>true</deleteConflictingFiles>
<undeployBeforeDeploy>true</undeployBeforeDeploy>
</configuration>
<extensions>true</extensions>
@@ -78,7 +78,6 @@
<avd>${emulator}</avd>
</emulator>
#end
- <deleteConflictingFiles>true</deleteConflictingFiles>
<undeployBeforeDeploy>true</undeployBeforeDeploy>
</configuration>
</plugin>
@@ -59,7 +59,6 @@
<avd>${emulator}</avd>
</emulator>
#end
- <deleteConflictingFiles>true</deleteConflictingFiles>
<undeployBeforeDeploy>true</undeployBeforeDeploy>
</configuration>
<extensions>true</extensions>
@@ -38,7 +38,6 @@
<sdk>
<platform>${platform}</platform>
</sdk>
- <deleteConflictingFiles>true</deleteConflictingFiles>
<undeployBeforeDeploy>true</undeployBeforeDeploy>
</configuration>
<extensions>true</extensions>

0 comments on commit 9b01890

Please sign in to comment.