You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/01 03:48:03 UTC
[37/38] git commit: [flex-falcon] [refs/heads/develop] - fix up
appmojo after merge
fix up appmojo after merge
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/55d9fcf9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/55d9fcf9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/55d9fcf9
Branch: refs/heads/develop
Commit: 55d9fcf989b7594a4f8e31205762ba0eedf68cae
Parents: 0f02a82
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 24 08:09:39 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 24 08:09:39 2017 -0700
----------------------------------------------------------------------
.../main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/55d9fcf9/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
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 @@ public class CompileAppMojo
@Override
protected File getOutput() throws MojoExecutionException {
-<<<<<<< HEAD
-=======
- if(outputJavaScript) {
- return new File(outputDirectory, javascriptOutputDirectoryName);
- }
->>>>>>> develop
return new File(outputDirectory, flashOutputFileName);
}