remove merge marks

This commit is contained in:
Matthew K. Fu JuYuan 2012-12-25 11:26:23 +08:00
parent 49e6c33b57
commit 2dd2368378
3 changed files with 7 additions and 11 deletions

View File

@ -342,10 +342,6 @@ zh_tw:
visitors_today: 今日造訪人次 visitors_today: 今日造訪人次
yes_: "是" yes_: "是"
<<<<<<< HEAD
=======
>>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
nccu: nccu:
date: 起迄日期 date: 起迄日期
file: 附加檔案 file: 附加檔案

View File

@ -2,11 +2,11 @@ module Archive
OrbitApp.registration "Archive",:type=> 'ModuleApp' do OrbitApp.registration "Archive",:type=> 'ModuleApp' do
module_label 'miss_module_i18n.archive' module_label 'miss_module_i18n.archive'
base_url File.expand_path File.dirname(__FILE__) base_url File.expand_path File.dirname(__FILE__)
<<<<<<< HEAD
personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'miss_plugin_i18n.archive' personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'miss_plugin_i18n.archive'
======= # =======
personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'admin.archive' # personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'admin.archive'
>>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1 # >>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
version "0.1" version "0.1"
organization "Rulingcom" organization "Rulingcom"

View File

@ -8,7 +8,8 @@ zh_tw:
calendars: 日曆 calendars: 日曆
gallery: 相簿 gallery: 相簿
location: Location location: Location
<<<<<<< HEAD
miss_plugin_i18n: miss_plugin_i18n:
personal_book: Personal Book personal_book: Personal Book
personal_diploma: Personal Diploma personal_diploma: Personal Diploma
@ -20,5 +21,4 @@ zh_tw:
personal_project: Personal Project personal_project: Personal Project
personal_research: Personal Research personal_research: Personal Research
personal_seminar: Personal Seminar personal_seminar: Personal Seminar
=======
>>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1