You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2015/05/08 23:54:10 UTC
[49/51] [abbrv] incubator-streams git commit: no message
no message
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e96ea384
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e96ea384
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e96ea384
Branch: refs/heads/pp-master
Commit: e96ea38462a8ee29bdbb7cefedfcdeee6952e695
Parents: 51bac07
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Fri May 8 16:22:36 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Fri May 8 16:22:36 2015 -0500
----------------------------------------------------------------------
pom.xml | 20 --------------------
1 file changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e96ea384/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bf10595..97f00b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,6 @@
</repository>
</repositories>
-<<<<<<< HEAD
<distributionManagement>
<repository>
<id>s3.release</id>
@@ -135,25 +134,6 @@
<url>s3://snapshots.peoplepattern.com</url>
</snapshotRepository>
</distributionManagement>
-=======
- <distributionManagement>
- <repository>
- <id>streams.releases</id>
- <name>Streams Releases</name>
- <url>${release.repository.url}</url>
- </repository>
- <!-- Snapshots (not-releases) are published to this repository -->
- <snapshotRepository>
- <id>streams.snapshots</id>
- <name>Streams Snapshots</name>
- <url>${snapshot.repository.url}</url>
- </snapshotRepository>
- <site>
- <id>site.streams.project</id>
- <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/streams/content/site/${project.version}/streams-project</url>
- </site>
- </distributionManagement>
->>>>>>> STREAMS-313
<properties>