This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new cdea0e2 missed this on the merge
cdea0e2 is described below
commit cdea0e2d96adbcc59c382d243071294b5de80a23
Author: Alex Harui <[email protected]>
AuthorDate: Tue Jan 23 11:37:14 2018 -0800
missed this on the merge
---
distribution/jars/compiler-compc/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/distribution/jars/compiler-compc/pom.xml
b/distribution/jars/compiler-compc/pom.xml
index 118cc86..424f17f 100644
--- a/distribution/jars/compiler-compc/pom.xml
+++ b/distribution/jars/compiler-compc/pom.xml
@@ -53,11 +53,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
-<<<<<<< HEAD
- <version>0.9.1-SNAPSHOT</version>
-=======
<version>${royale.compiler.version}</version>
->>>>>>> release/0.9.0
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
[email protected].
