diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-01 17:17:49 -0400 |
| commit | 031b31dfcc2b99836021d6e251c78a9fc339d444 (patch) | |
| tree | 4193ce7f3cd69f60a304e7d720baf943cf09da86 /app/models/server_settings.rb | |
| parent | cd6b94cfc989800d65acc0fbceeebe35da5be4af (diff) | |
| parent | 0f2b05889cba090e4824f62965ee8d131da09973 (diff) | |
Settled Merge Conflicts.
Diffstat (limited to 'app/models/server_settings.rb')
| -rw-r--r-- | app/models/server_settings.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb deleted file mode 100644 index 7f49863..0000000 --- a/app/models/server_settings.rb +++ /dev/null @@ -1,2 +0,0 @@ -class ServerSettings < ActiveRecord::Base -end |