diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-10 20:55:35 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-10 20:55:35 -0400 |
commit | 8f5359ec043e4f56ed74a99ba660c4b47fae057d (patch) | |
tree | f911b01d5963a7d25a81143c6f701a90d114631a /config/initializers | |
parent | 1324ca83e5b1e4de83e93f1ba2e29066f0e86f72 (diff) |
fix bad merge
Diffstat (limited to 'config/initializers')
0 files changed, 0 insertions, 0 deletions