[royale-compiler] 02/03: clean up Maven build

[ah...@apache.org]

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-compiler.git

commit 5a4434a021da191a8aa12394ee26f410de60ef01
Author: Alex Harui <ah...@apache.org>
AuthorDate: Tue Nov 7 10:41:43 2017 -0800

    clean up Maven build
---
 flex-compiler-oem/pom.xml | 2 +-
 pom.xml                   | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index 5d06c21..c7d25e9 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -29,7 +29,7 @@
   <artifactId>flex-compiler-oem</artifactId>
   <version>0.9.0-SNAPSHOT</version>
 
-  <name>Apache Flex - Royale: Compiler: OEM Layer</name>
+  <name>Apache Royale: Compiler: OEM Layer</name>
 
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index ba2537e..697af3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,11 +75,7 @@
   </distributionManagement>
 
   <issueManagement>
-<<<<<<< HEAD
     <system>GitHub</system>
-=======
-    <system>GitHub Issues</system>
->>>>>>> Change url to the repository in main pom to check whether it influence Maven compiler build
     <url>https://github.com/apache/royale-compiler/issues</url>
   </issueManagement>
 

-- 
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.