From 9be6df875abfd16d1981395398619008fedbde85 Mon Sep 17 00:00:00 2001 From: piaip Date: Mon, 5 Oct 2009 16:01:37 +0000 Subject: * prevent pause in auto merge (which may break sync) * note: smart merge still cannot promise 100% sync in current model. however, it should be good enough. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4902 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- mbbsd/bbs.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'mbbsd/bbs.c') diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index 5d2e2180..643a26fe 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -1539,16 +1539,7 @@ edit_post(int ent, fileheader_t * fhdr, const char *direct) oldmt = newmt; outs(ANSI_COLOR(1) "合併成功\，新修改(或推文)已加入您的文章中。\n" - "您沒有蓋\掉任何推文或修改，請勿擔心。" ANSI_RESET "\n"); - -#ifdef WARN_EXP_SMARTMERGE - outs(ANSI_COLOR(1;33) - "自動合併 (Smart Merge) 是實驗中的新功\能，" - "請檢查一下您的文章合併後是否正常。" ANSI_RESET "\n" - "若有問題請至 " BN_BUGREPORT " 板報告，謝謝。"); -#endif - vmsg("合併完成"); } else { outs(ANSI_COLOR(31) "自動合併失敗。 請改用人工手動編輯合併。" ANSI_RESET); -- cgit v1.2.3