From 2dd2368378211bca2c4632d5aff9a60ba9bd82d8 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 25 Dec 2012 11:26:23 +0800
Subject: [PATCH] remove merge marks

---
 config/locales/zh_tw.yml                                  | 4 ----
 vendor/built_in_modules/archive/init.rb                   | 8 ++++----
 .../built_in_modules/miss_module/config/locales/zh_tw.yml | 6 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/config/locales/zh_tw.yml b/config/locales/zh_tw.yml
index 3ea48c90..9c087807 100644
--- a/config/locales/zh_tw.yml
+++ b/config/locales/zh_tw.yml
@@ -342,10 +342,6 @@ zh_tw:
   visitors_today: 今日造訪人次
   yes_: "是"
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
   nccu:
     date: 起迄日期
     file: 附加檔案
diff --git a/vendor/built_in_modules/archive/init.rb b/vendor/built_in_modules/archive/init.rb
index 15e83978..5efd18f7 100644
--- a/vendor/built_in_modules/archive/init.rb
+++ b/vendor/built_in_modules/archive/init.rb
@@ -2,11 +2,11 @@ module Archive
   OrbitApp.registration "Archive",:type=> 'ModuleApp' do
     module_label 'miss_module_i18n.archive'
     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=>'admin.archive'
->>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
+# =======
+#     personal_plugin :enable => true,:path=>"panel/archive/plugin/profile",:i18n=>'admin.archive'
+# >>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
     
     version "0.1"
     organization "Rulingcom"
diff --git a/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml b/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
index c8108e3c..18cbc760 100644
--- a/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
@@ -8,7 +8,8 @@ zh_tw:
     calendars: 日曆
     gallery: 相簿
     location: Location
-<<<<<<< HEAD
+
+
   miss_plugin_i18n:
     personal_book: Personal Book
     personal_diploma: Personal Diploma
@@ -20,5 +21,4 @@ zh_tw:
     personal_project: Personal Project
     personal_research: Personal Research
     personal_seminar: Personal Seminar
-=======
->>>>>>> 858e942da234fffa3053a995231f2b0d9eee43d1
+