Fix invalid merge from master.
Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/30822f1c Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/30822f1c Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/30822f1c Branch: refs/heads/master Commit: 30822f1c15e6071cc55e00812facfa1e45d22d88 Parents: 5a5f527 Author: Damien Raude-Morvan <dam...@dictanova.com> Authored: Tue May 20 14:58:47 2014 +0200 Committer: Damien Raude-Morvan <dam...@dictanova.com> Committed: Tue May 20 14:58:47 2014 +0200 ---------------------------------------------------------------------- pom.xml | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/30822f1c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 98e69b1..0396ee4 100644 --- a/pom.xml +++ b/pom.xml @@ -241,15 +241,9 @@ </mailingLists> <scm> -<<<<<<< HEAD - <connection>scm:svn:http://svn.apache.org/repos/asf/gora/trunk/</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/gora/trunk/</developerConnection> - <url>http://svn.apache.org/viewvc/gora/trunk/</url> -======= <connection>scm:git:http://git-wip-us.apache.org/repos/asf/gora.git</connection> <developerConnection>scm:git:http://git-wip-us.apache.org/repos/asf/gora.git</developerConnection> <url>https://git-wip-us.apache.org/repos/asf/gora.git</url> ->>>>>>> upstream/master </scm> <issueManagement> <system>JIRA</system>