clean up merge problem

jeffscottbrown · jeffscottbrown · commit ff57b2e60195 · 2012-12-15T09:49:48.000-06:00
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -120,8 +120,6 @@ task pluginsFromRepo {
                     dest: dir, verbose: true, usetimestamp: true)
                 get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",
                     dest: dir, verbose: true, usetimestamp: true)
-                get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",
-                    dest: dir, verbose: true, usetimestamp: true)
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,6 @@ task pluginsFromRepo {`
`120`	`120`	`dest: dir, verbose: true, usetimestamp: true)`
`121`	`121`	`get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",`
`122`	`122`	`dest: dir, verbose: true, usetimestamp: true)`
`123`		`- get(src: "http://grails.org/plugins/grails-${name}/tags/RELEASE_${versionTag}/grails-${name}-${version}.pom",`
`124`		`- dest: dir, verbose: true, usetimestamp: true)`
`125`	`123`	`}`
`126`	`124`	`}`
`127`	`125`	`}`