This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a commit to branch feature/rename
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/feature/rename by this push:
new a5b23f6 Fix merge issue during renaming
a5b23f6 is described below
commit a5b23f6709d1de7f879ef29251c31561c89b6407
Author: Piotr Zarzycki <[email protected]>
AuthorDate: Thu Nov 16 19:19:08 2017 +0100
Fix merge issue during renaming
---
pom.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba2537e..cd51699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,11 +75,8 @@
</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
+ <!--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
['"[email protected]" <[email protected]>'].
