diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-28 19:57:02 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-28 19:57:02 -0400 |
| commit | 3ab30900798a838b399d06f28251b6cdd82a94de (patch) | |
| tree | b0e5ba4dee18ad9fc0902a1969fdaf9e9306d1f9 /app/models | |
| parent | d5d480bc0a98eb3532ce0a6567585b791e44db07 (diff) | |
| parent | a81ca51690e81444ecb87435ef29195b1e017f68 (diff) | |
Fixed the db/seeds merge conflict
Diffstat (limited to 'app/models')
0 files changed, 0 insertions, 0 deletions