diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
| commit | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch) | |
| tree | e59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /.gitignore | |
| parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
| parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) | |
Fixed some merge errors in show.html.erb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -23,3 +23,4 @@ nohup.out *~ *# .#* +.nfs* |