diff options
Resolve merge failure
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/Migration.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Data/Migration.cs b/OpenSim/Data/Migration.cs index c177097..86531d9 100644 --- a/OpenSim/Data/Migration.cs +++ b/OpenSim/Data/Migration.cs | |||
| @@ -407,9 +407,8 @@ scan_old_style: | |||
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | if (migrations.Count < 1) | 409 | if (migrations.Count < 1) |
| 410 | { | 410 | m_log.DebugFormat("[MIGRATIONS]: {0} data tables already up to date at revision {1}", _type, after); |
| 411 | m_log.InfoFormat("[MIGRATIONS]: {0} up to date, no migrations to apply", _type); | 411 | |
| 412 | } | ||
| 413 | return migrations; | 412 | return migrations; |
| 414 | } | 413 | } |
| 415 | } | 414 | } |