From d0cef0104ea51715790ac0339e28fd761b407776 Mon Sep 17 00:00:00 2001 From: totoro Date: Sun, 24 Jul 2022 10:07:23 +0900 Subject: [PATCH] resolve conflict --- view/load_vtm.anubis | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/load_vtm.anubis b/view/load_vtm.anubis index 2205aaf..68a4fe7 100644 --- a/view/load_vtm.anubis +++ b/view/load_vtm.anubis @@ -25,8 +25,8 @@ public define Maybe(VTM) file_damaged then print("File '"+file_name+"' is damaged.\n\n");failure, bad_version(expected,found) then print("Secondary module '"+file_name+"' doesn't have the same\n"+ " version ("+found+") as primary module ("+expected+").\n\n");failure, - wrong_type(expected,found) then print("Secondary module '"+file_name+"' has different type:\n");failure, - ok(vtm_plugin) then println("vtm plugin "+vtm_plugin.db_version+" loaded "); success(vtm_plugin) + wrong_type(expected,found) then print("vtm plugin '"+file_name+"' is not compatible with the current version\n");failure, + ok(vtm_plugin) then println("vtm plugin "+vtm_plugin.db_version+" loaded "); success(vtm_plugin) }. define Maybe(VTM) -- libgit2 0.21.4