Conflicts: app/views/layouts/project.html.haml db/schema.rb |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrate | ||
| pkey.example | ||
| schema.rb | ||
| seeds.rb | ||
Conflicts: app/views/layouts/project.html.haml db/schema.rb |
||
|---|---|---|
| .. | ||
| fixtures | ||
| migrate | ||
| pkey.example | ||
| schema.rb | ||
| seeds.rb | ||