fix the merge conflict correctly

GradleUp · Jun 5, 2014 · b4a6b34 · b4a6b34
1 parent 25142e7
commit b4a6b34
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/README_old.md b/README_old.md
@@ -48,7 +48,7 @@ jar signature files
 Configuration Options
 =====================
 
-+ destinationDir - configures the output directory for shadow. Default: $buildDir/libs/
++ destinationDir - configures the output directory for shadow. Default: $buildDir/distributions/
 + baseName - configures the base name of the output file. Default: ${archivesBaseName}-${version}-${classifier}
 + classifier - the classifier the append to the artifact. Default: shadow
 + extension - configures the extension of the output file. Default: jar