| commit | 55d9fcf989b7594a4f8e31205762ba0eedf68cae | [log] [tgz] |
|---|---|---|
| author | Alex Harui <aharui@apache.org> | Mon Apr 24 08:09:39 2017 -0700 |
| committer | Alex Harui <aharui@apache.org> | Mon Apr 24 08:09:39 2017 -0700 |
| tree | fd430261f2f9a4e6ee946162a0b6e84abb1a5650 | |
| parent | 0f02a8202c4233694bb2cb93e784b6b1cdd29843 [diff] |
fix up appmojo after merge
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java index 46f6b33..61ab8bf 100644 --- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java +++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -82,12 +82,6 @@ @Override protected File getOutput() throws MojoExecutionException { -<<<<<<< HEAD -======= - if(outputJavaScript) { - return new File(outputDirectory, javascriptOutputDirectoryName); - } ->>>>>>> develop return new File(outputDirectory, flashOutputFileName); }