Resolve merge conflict, update rspec syntax and docs
[arvados.git] / .gitignore
1 ._*
2 .DS_Store
3 .yardoc
4 .bundle
5 .rvmrc
6 Gemfile.lock
7 coverage
8 doc
9 heckling
10 pkg
11 specdoc
12 wiki
13 .google-api.yaml
14 *.log
15
16 #IntelliJ
17 .idea
18 *.iml
19 atlassian*
20