remove merge marks

2012-12-25 11:26:23 +08:00
1 parent 49e6c33b57
commit 2dd2368378
@@ -342,10 +342,6 @@ zh_tw:
  visitors_today: 今日造訪人次
  yes_: "是"

-<<<<<<< HEAD
-
-=======
->>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
  nccu:
    date: 起迄日期
    file: 附加檔案