Merge branch 'master' of github.com:trasukg/river-container
Conflicts:
.gitignore
Project: http://git-wip-us.apache.org/repos/asf/river-container/repo
Commit: http://git-wip-us.apache.org/repos/asf/river-container/commit/7e747be5
Tree: http://git-wip-us.apache.org/repos/asf/river-container/tree/7e747be5
Diff: http://git-wip-us.apache.org/repos/asf/river-container/diff/7e747be5
Branch: refs/heads/master
Commit: 7e747be5f91ae31bc7e70c1169bb2a1ba799079e
Parents: 5bbf0dc dc6791f
Author: Greg Trasuk <[email protected]>
Authored: Mon May 27 04:03:15 2013 -0400
Committer: Greg Trasuk <[email protected]>
Committed: Mon May 27 04:03:15 2013 -0400
----------------------------------------------------------------------
.gitignore | 6 ++++++
README.md | 4 ++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/river-container/blob/7e747be5/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 61f9919,0f182a0..0c93635
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,6 +1,7 @@@
+*/target/**
+ *.class
+
+ # Package Files #
+ *.jar
+ *.war
+ *.ear
