diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-10-06 00:01:37 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-10-06 00:01:37 +0800 |
| commit | cb21ea6154f15598b00eb723f8ec0299e0d956f5 (patch) | |
| tree | d5f2125664ef5c5b1f1ddd19da450fa3f5558a04 | |
| parent | 91b51e9227df65b9fed081f15f91c1f50548841d (diff) | |
| download | pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.tar pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.tar.gz pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.tar.bz2 pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.tar.lz pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.tar.xz pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.tar.zst pttbbs-cb21ea6154f15598b00eb723f8ec0299e0d956f5.zip | |
* 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@4902 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | pttbbs/mbbsd/bbs.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c index 5d2e2180..643a26fe 100644 --- a/pttbbs/mbbsd/bbs.c +++ b/pttbbs/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); |