/.bundle/
/.yardoc
/Gemfile.lock
/_yardoc/
/coverage/
/doc/
/pkg/
/spec/reports/
/tmp/
<<<<<<< f0976cd4b81347c0d687988ff6463d3113e547d2
<<<<<<< 8569ecf8bd116d9e214f6907f29993bd8e03d40d
/svn-commit.tmp
=======
>>>>>>> Initial commit
=======
/svn-commit.tmp
>>>>>>> remove bin