<<<<<<< HEAD
!.gitignore
*.gz
*.zip
*.md5
*.sha1
jruby-complete.jar
bin/*
!bin/gem
!bin/update_rubygems
build
build.eclipse
build.properties
target
dist
lib/native
lib/*.jar
nbproject/private
share
latest_source_cache
src_gen
docs/api
spec/ruby
test/rails
test/prawn
gem/lib/*.jar
gem/lib/jruby-jars/version.rb
gem/pkg
*.orig
*.rej
*~
tool/nailgun/Makefile
tool/nailgun/ng
tool/nailgun/config.log
tool/nailgun/config.status
jruby-findbugs.html
.debug.properties
test/testapp/testapp
glob_test
spaces test
.DS_Store
*.so
*.bundle
*.[oa]
dev_null
.redcar
/.externalToolBuilders/
/.settings/
RemoteSystemsTempFiles
=======
!.gitignore
*.gz
*.zip
*.md5
*.sha1
jruby-complete.jar
bin/*
!bin/gem
!bin/update_rubygems
build
build.eclipse
build.properties
target
dist
lib/native
lib/*.jar
nbproject/private
share
latest_source_cache
src_gen
docs/api
spec/ruby
test/rails
test/prawn
gem/lib/*.jar
gem/lib/jruby-jars/version.rb
gem/pkg
*.orig
*.rej
*~
tool/nailgun/Makefile
tool/nailgun/ng
tool/nailgun/config.log
tool/nailgun/config.status
jruby-findbugs.html
.debug.properties
test/testapp/testapp
glob_test
spaces test
.DS_Store
*.so
*.bundle
*.[oa]
dev_null
.redcar
/.externalToolBuilders/
/.settings/
RemoteSystemsTempFiles
>>>>>>> d5bfff6d58522e0a75d5fba379d7ae288297a6fd
.metadata