From 824b484e67f89dd479dbd5c34be75487b98822d8 Mon Sep 17 00:00:00 2001
From: Saurabh Bhatia <saurabh.a.bhatia@gmail.com>
Date: Thu, 1 May 2014 15:55:10 +0800
Subject: [PATCH] Fixes en.yml conflicts

---
 config/locales/en.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bcb50e0..166e1ca 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -578,7 +578,6 @@ en:
   update_: Update
   update_at: Update at
   update_manager: Update Manager
-<<<<<<< Updated upstream
   update_manager_:
     available_updates: Available Updates 
     check_update: Check Update
@@ -599,7 +598,6 @@ en:
     time: Time
     name: Account
     page: Access Page and Action
-=======
   locale: Locale
   login: Login
   logout: Logout
@@ -623,7 +621,6 @@ en:
   authorization: Authorization
   module_authorization: Module Authorization
   
->>>>>>> Stashed changes
   users:
     admin_change_password: You cannot change your own password here!
     avatar: Profile Picture