Commit d0cef0104ea51715790ac0339e28fd761b407776
1 parent
6ae75b2a
resolve conflict
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
view/load_vtm.anubis
| @@ -25,8 +25,8 @@ public define Maybe(VTM) | @@ -25,8 +25,8 @@ public define Maybe(VTM) | ||
| 25 | file_damaged then print("File '"+file_name+"' is damaged.\n\n");failure, | 25 | file_damaged then print("File '"+file_name+"' is damaged.\n\n");failure, |
| 26 | bad_version(expected,found) then print("Secondary module '"+file_name+"' doesn't have the same\n"+ | 26 | bad_version(expected,found) then print("Secondary module '"+file_name+"' doesn't have the same\n"+ |
| 27 | " version ("+found+") as primary module ("+expected+").\n\n");failure, | 27 | " version ("+found+") as primary module ("+expected+").\n\n");failure, |
| 28 | - wrong_type(expected,found) then print("Secondary module '"+file_name+"' has different type:\n");failure, | ||
| 29 | - ok(vtm_plugin) then println("vtm plugin "+vtm_plugin.db_version+" loaded "); success(vtm_plugin) | 28 | + wrong_type(expected,found) then print("vtm plugin '"+file_name+"' is not compatible with the current version\n");failure, |
| 29 | + ok(vtm_plugin) then println("vtm plugin "+vtm_plugin.db_version+" loaded "); success(vtm_plugin) | ||
| 30 | }. | 30 | }. |
| 31 | 31 | ||
| 32 | define Maybe(VTM) | 32 | define Maybe(VTM) |