1bced3b207
Conflicts: .gitignore lib/couchrest/model/base.rb lib/couchrest/model/configuration.rb lib/couchrest_model.rb
11 lines
83 B
Plaintext
11 lines
83 B
Plaintext
.DS_Store
|
|
html/*
|
|
pkg
|
|
*.swp
|
|
.rvmrc*
|
|
.bundle
|
|
couchdb.std*
|
|
*.*~
|
|
Gemfile.lock
|
|
spec.out
|